]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-2.2.2-2.6.32.57-201202131842.patch
projects / thirdparty / grsecurity-scrape.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Auto commit, 1 new patch{es}.
[thirdparty/grsecurity-scrape.git] / test / grsecurity-2.2.2-2.6.32.57-201202131842.patch
CommitLineData
27a14279
PK		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index e1efc40..47f0daf 100644
3--- a/Documentation/dontdiff
4+++ b/Documentation/dontdiff
5@@ -1,15 +1,19 @@
6 *.a
7 *.aux
8 *.bin
9+*.cis
10 *.cpio
11 *.csp
12+*.dbg
13 *.dsp
14 *.dvi
15 *.elf
16 *.eps
17 *.fw
18+*.gcno
19 *.gen.S
20 *.gif
21+*.gmo
22 *.grep
23 *.grp
24 *.gz
25@@ -38,8 +42,10 @@
26 *.tab.h
27 *.tex
28 *.ver
29+*.vim
30 *.xml
31 *_MODULES
32+*_reg_safe.h
33 *_vga16.c
34 *~
35 *.9
36@@ -49,11 +55,16 @@
37 53c700_d.h
38 CVS
39 ChangeSet
40+GPATH
41+GRTAGS
42+GSYMS
43+GTAGS
44 Image
45 Kerntypes
46 Module.markers
47 Module.symvers
48 PENDING
49+PERF*
50 SCCS
51 System.map*
52 TAGS
53@@ -76,7 +87,11 @@ btfixupprep
54 build
55 bvmlinux
56 bzImage*
57+capability_names.h
58+capflags.c
59 classlist.h*
60+clut_vga16.c
61+common-cmds.h
62 comp*.log
63 compile.h*
64 conf
65@@ -84,6 +99,8 @@ config
66 config-*
67 config_data.h*
68 config_data.gz*
69+config.c
70+config.tmp
71 conmakehash
72 consolemap_deftbl.c*
73 cpustr.h
74@@ -97,19 +114,23 @@ elfconfig.h*
75 fixdep
76 fore200e_mkfirm
77 fore200e_pca_fw.c*
78+gate.lds
79 gconf
80 gen-devlist
81 gen_crc32table
82 gen_init_cpio
83 genksyms
84 *_gray256.c
85+hash
86+hid-example
87 ihex2fw
88 ikconfig.h*
89 initramfs_data.cpio
90+initramfs_data.cpio.bz2
91 initramfs_data.cpio.gz
92 initramfs_list
93 kallsyms
94-kconfig
95+kern_constants.h
96 keywords.c
97 ksym.c*
98 ksym.h*
99@@ -127,13 +148,16 @@ machtypes.h
100 map
101 maui_boot.h
102 mconf
103+mdp
104 miboot*
105 mk_elfconfig
106 mkboot
107 mkbugboot
108 mkcpustr
109 mkdep
110+mkpiggy
111 mkprep
112+mkregtable
113 mktables
114 mktree
115 modpost
116@@ -149,6 +173,7 @@ patches*
117 pca200e.bin
118 pca200e_ecd.bin2
119 piggy.gz
120+piggy.S
121 piggyback
122 pnmtologo
123 ppc_defs.h*
124@@ -157,12 +182,15 @@ qconf
125 raid6altivec*.c
126 raid6int*.c
127 raid6tables.c
128+regdb.c
129 relocs
130+rlim_names.h
131 series
132 setup
133 setup.bin
134 setup.elf
135 sImage
136+slabinfo
137 sm_tbl*
138 split-include
139 syscalltab.h
140@@ -171,6 +199,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@@ -186,14 +215,20 @@ version.h*
149 vmlinux
150 vmlinux-*
151 vmlinux.aout
152+vmlinux.bin.all
153+vmlinux.bin.bz2
154 vmlinux.lds
155+vmlinux.relocs
156+voffset.h
157 vsyscall.lds
158 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+zoffset.h
169diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
170index c840e7d..f4c451c 100644
171--- a/Documentation/kernel-parameters.txt
172+++ b/Documentation/kernel-parameters.txt
173@@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters. It is defined in the file
174 the specified number of seconds. This is to be used if
175 your oopses keep scrolling off the screen.
176
177+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
178+ virtualization environments that don't cope well with the
179+ expand down segment used by UDEREF on X86-32 or the frequent
180+ page table updates on X86-64.
181+
182+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
183+
184 pcbit= [HW,ISDN]
185
186 pcd. [PARIDE]
187diff --git a/Makefile b/Makefile
188index 3377650..76aacb3 100644
189--- a/Makefile
190+++ b/Makefile
191@@ -221,8 +221,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
192
193 HOSTCC = gcc
194 HOSTCXX = g++
195-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
196-HOSTCXXFLAGS = -O2
197+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
198+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
199+HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
200
201 # Decide whether to build built-in, modular, or both.
202 # Normally, just do built-in.
203@@ -376,8 +377,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exc
204 # Rules shared between *config targets and build targets
205
206 # Basic helpers built in scripts/
207-PHONY += scripts_basic
208-scripts_basic:
209+PHONY += scripts_basic gcc-plugins
210+scripts_basic: gcc-plugins
211 $(Q)$(MAKE) $(build)=scripts/basic
212
213 # To avoid any implicit rule to kick in, define an empty command.
214@@ -403,7 +404,7 @@ endif
215 # of make so .config is not included in this case either (for *config).
216
217 no-dot-config-targets := clean mrproper distclean \
218- cscope TAGS tags help %docs check% \
219+ cscope gtags TAGS tags help %docs check% \
220 include/linux/version.h headers_% \
221 kernelrelease kernelversion
222
223@@ -526,6 +527,46 @@ else
224 KBUILD_CFLAGS += -O2
225 endif
226
227+ifndef DISABLE_PAX_PLUGINS
228+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
229+ifndef DISABLE_PAX_CONSTIFY_PLUGIN
230+CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
231+endif
232+ifdef CONFIG_PAX_MEMORY_STACKLEAK
233+STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
234+STACKLEAK_PLUGIN += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
235+endif
236+ifdef CONFIG_KALLOCSTAT_PLUGIN
237+KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
238+endif
239+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
240+KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
241+KERNEXEC_PLUGIN += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD)
242+endif
243+ifdef CONFIG_CHECKER_PLUGIN
244+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
245+CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
246+endif
247+endif
248+GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
249+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN
250+ifeq ($(KBUILD_EXTMOD),)
251+gcc-plugins:
252+ $(Q)$(MAKE) $(build)=tools/gcc
253+else
254+gcc-plugins: ;
255+endif
256+else
257+gcc-plugins:
258+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
259+ $(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.))
260+else
261+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
262+endif
263+ $(Q)echo "PAX_MEMORY_STACKLEAK and constification will be less secure"
264+endif
265+endif
266+
267 include $(srctree)/arch/$(SRCARCH)/Makefile
268
269 ifneq ($(CONFIG_FRAME_WARN),0)
270@@ -647,7 +688,7 @@ export mod_strip_cmd
271
272
273 ifeq ($(KBUILD_EXTMOD),)
274-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
275+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
276
277 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
278 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
279@@ -868,6 +909,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
280
281 # The actual objects are generated when descending,
282 # make sure no implicit rule kicks in
283+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS)
284 $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
285
286 # Handle descending into subdirectories listed in $(vmlinux-dirs)
287@@ -877,7 +919,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
288 # Error messages still appears in the original language
289
290 PHONY += $(vmlinux-dirs)
291-$(vmlinux-dirs): prepare scripts
292+$(vmlinux-dirs): gcc-plugins prepare scripts
293 $(Q)$(MAKE) $(build)=$@
294
295 # Build the kernel release string
296@@ -986,6 +1028,7 @@ prepare0: archprepare FORCE
297 $(Q)$(MAKE) $(build)=. missing-syscalls
298
299 # All the preparing..
300+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS),$(KBUILD_CFLAGS))
301 prepare: prepare0
302
303 # The asm symlink changes when $(ARCH) changes.
304@@ -1127,6 +1170,7 @@ all: modules
305 # using awk while concatenating to the final file.
306
307 PHONY += modules
308+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
309 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
310 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
311 @$(kecho) ' Building modules, stage 2.';
312@@ -1136,7 +1180,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
313
314 # Target to prepare building external modules
315 PHONY += modules_prepare
316-modules_prepare: prepare scripts
317+modules_prepare: gcc-plugins prepare scripts
318
319 # Target to install modules
320 PHONY += modules_install
321@@ -1201,7 +1245,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
322 include/linux/autoconf.h include/linux/version.h \
323 include/linux/utsrelease.h \
324 include/linux/bounds.h include/asm*/asm-offsets.h \
325- Module.symvers Module.markers tags TAGS cscope*
326+ Module.symvers Module.markers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
327
328 # clean - Delete most, but leave enough to build external modules
329 #
330@@ -1245,7 +1289,7 @@ distclean: mrproper
331 @find $(srctree) $(RCS_FIND_IGNORE) \
332 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
333 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
334- -o -name '.*.rej' -o -size 0 \
335+ -o -name '.*.rej' -o -name '*.so' -o -size 0 \
336 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
337 -type f -print | xargs rm -f
338
339@@ -1292,6 +1336,7 @@ help:
340 @echo ' modules_prepare - Set up for building external modules'
341 @echo ' tags/TAGS - Generate tags file for editors'
342 @echo ' cscope - Generate cscope index'
343+ @echo ' gtags - Generate GNU GLOBAL index'
344 @echo ' kernelrelease - Output the release version string'
345 @echo ' kernelversion - Output the version stored in Makefile'
346 @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
347@@ -1393,6 +1438,7 @@ PHONY += $(module-dirs) modules
348 $(module-dirs): crmodverdir $(objtree)/Module.symvers
349 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
350
351+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
352 modules: $(module-dirs)
353 @$(kecho) ' Building modules, stage 2.';
354 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
355@@ -1448,7 +1494,7 @@ endif # KBUILD_EXTMOD
356 quiet_cmd_tags = GEN $@
357 cmd_tags = $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@
358
359-tags TAGS cscope: FORCE
360+tags TAGS cscope gtags: FORCE
361 $(call cmd,tags)
362
363 # Scripts to check various things for consistency
364@@ -1513,17 +1559,19 @@ else
365 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
366 endif
367
368-%.s: %.c prepare scripts FORCE
369+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS)
370+%.s: %.c gcc-plugins prepare scripts FORCE
371 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
372 %.i: %.c prepare scripts FORCE
373 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
374-%.o: %.c prepare scripts FORCE
375+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS)
376+%.o: %.c gcc-plugins prepare scripts FORCE
377 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
378 %.lst: %.c prepare scripts FORCE
379 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
380-%.s: %.S prepare scripts FORCE
381+%.s: %.S gcc-plugins prepare scripts FORCE
382 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
383-%.o: %.S prepare scripts FORCE
384+%.o: %.S gcc-plugins prepare scripts FORCE
385 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
386 %.symtypes: %.c prepare scripts FORCE
387 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
388@@ -1533,11 +1581,13 @@ endif
389 $(cmd_crmodverdir)
390 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
391 $(build)=$(build-dir)
392-%/: prepare scripts FORCE
393+%/: KBUILD_CFLAGS += $(GCC_PLUGINS)
394+%/: gcc-plugins prepare scripts FORCE
395 $(cmd_crmodverdir)
396 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
397 $(build)=$(build-dir)
398-%.ko: prepare scripts FORCE
399+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS)
400+%.ko: gcc-plugins prepare scripts FORCE
401 $(cmd_crmodverdir)
402 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
403 $(build)=$(build-dir) $(@:.ko=.o)
404diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
405index 5c75c1b..c82f878 100644
406--- a/arch/alpha/include/asm/elf.h
407+++ b/arch/alpha/include/asm/elf.h
408@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
409
410 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
411
412+#ifdef CONFIG_PAX_ASLR
413+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
414+
415+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
416+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
417+#endif
418+
419 /* $0 is set by ld.so to a pointer to a function which might be
420 registered using atexit. This provides a mean for the dynamic
421 linker to call DT_FINI functions for shared libraries that have
422diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
423index 3f0c59f..cf1e100 100644
424--- a/arch/alpha/include/asm/pgtable.h
425+++ b/arch/alpha/include/asm/pgtable.h
426@@ -101,6 +101,17 @@ struct vm_area_struct;
427 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
428 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
429 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
430+
431+#ifdef CONFIG_PAX_PAGEEXEC
432+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
433+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
434+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
435+#else
436+# define PAGE_SHARED_NOEXEC PAGE_SHARED
437+# define PAGE_COPY_NOEXEC PAGE_COPY
438+# define PAGE_READONLY_NOEXEC PAGE_READONLY
439+#endif
440+
441 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
442
443 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
444diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
445index ebc3c89..20cfa63 100644
446--- a/arch/alpha/kernel/module.c
447+++ b/arch/alpha/kernel/module.c
448@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
449
450 /* The small sections were sorted to the end of the segment.
451 The following should definitely cover them. */
452- gp = (u64)me->module_core + me->core_size - 0x8000;
453+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
454 got = sechdrs[me->arch.gotsecindex].sh_addr;
455
456 for (i = 0; i < n; i++) {
457diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
458index a94e49c..d71dd44 100644
459--- a/arch/alpha/kernel/osf_sys.c
460+++ b/arch/alpha/kernel/osf_sys.c
461@@ -1172,7 +1172,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
462 /* At this point: (!vma || addr < vma->vm_end). */
463 if (limit - len < addr)
464 return -ENOMEM;
465- if (!vma || addr + len <= vma->vm_start)
466+ if (check_heap_stack_gap(vma, addr, len))
467 return addr;
468 addr = vma->vm_end;
469 vma = vma->vm_next;
470@@ -1208,6 +1208,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
471 merely specific addresses, but regions of memory -- perhaps
472 this feature should be incorporated into all ports? */
473
474+#ifdef CONFIG_PAX_RANDMMAP
475+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
476+#endif
477+
478 if (addr) {
479 addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
480 if (addr != (unsigned long) -ENOMEM)
481@@ -1215,8 +1219,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
482 }
483
484 /* Next, try allocating at TASK_UNMAPPED_BASE. */
485- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
486- len, limit);
487+ addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
488+
489 if (addr != (unsigned long) -ENOMEM)
490 return addr;
491
492diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
493index 00a31de..2ded0f2 100644
494--- a/arch/alpha/mm/fault.c
495+++ b/arch/alpha/mm/fault.c
496@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
497 __reload_thread(pcb);
498 }
499
500+#ifdef CONFIG_PAX_PAGEEXEC
501+/*
502+ * PaX: decide what to do with offenders (regs->pc = fault address)
503+ *
504+ * returns 1 when task should be killed
505+ * 2 when patched PLT trampoline was detected
506+ * 3 when unpatched PLT trampoline was detected
507+ */
508+static int pax_handle_fetch_fault(struct pt_regs *regs)
509+{
510+
511+#ifdef CONFIG_PAX_EMUPLT
512+ int err;
513+
514+ do { /* PaX: patched PLT emulation #1 */
515+ unsigned int ldah, ldq, jmp;
516+
517+ err = get_user(ldah, (unsigned int *)regs->pc);
518+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
519+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
520+
521+ if (err)
522+ break;
523+
524+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
525+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
526+ jmp == 0x6BFB0000U)
527+ {
528+ unsigned long r27, addr;
529+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
530+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
531+
532+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
533+ err = get_user(r27, (unsigned long *)addr);
534+ if (err)
535+ break;
536+
537+ regs->r27 = r27;
538+ regs->pc = r27;
539+ return 2;
540+ }
541+ } while (0);
542+
543+ do { /* PaX: patched PLT emulation #2 */
544+ unsigned int ldah, lda, br;
545+
546+ err = get_user(ldah, (unsigned int *)regs->pc);
547+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
548+ err |= get_user(br, (unsigned int *)(regs->pc+8));
549+
550+ if (err)
551+ break;
552+
553+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
554+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
555+ (br & 0xFFE00000U) == 0xC3E00000U)
556+ {
557+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
558+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
559+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
560+
561+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
562+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
563+ return 2;
564+ }
565+ } while (0);
566+
567+ do { /* PaX: unpatched PLT emulation */
568+ unsigned int br;
569+
570+ err = get_user(br, (unsigned int *)regs->pc);
571+
572+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
573+ unsigned int br2, ldq, nop, jmp;
574+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
575+
576+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
577+ err = get_user(br2, (unsigned int *)addr);
578+ err |= get_user(ldq, (unsigned int *)(addr+4));
579+ err |= get_user(nop, (unsigned int *)(addr+8));
580+ err |= get_user(jmp, (unsigned int *)(addr+12));
581+ err |= get_user(resolver, (unsigned long *)(addr+16));
582+
583+ if (err)
584+ break;
585+
586+ if (br2 == 0xC3600000U &&
587+ ldq == 0xA77B000CU &&
588+ nop == 0x47FF041FU &&
589+ jmp == 0x6B7B0000U)
590+ {
591+ regs->r28 = regs->pc+4;
592+ regs->r27 = addr+16;
593+ regs->pc = resolver;
594+ return 3;
595+ }
596+ }
597+ } while (0);
598+#endif
599+
600+ return 1;
601+}
602+
603+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
604+{
605+ unsigned long i;
606+
607+ printk(KERN_ERR "PAX: bytes at PC: ");
608+ for (i = 0; i < 5; i++) {
609+ unsigned int c;
610+ if (get_user(c, (unsigned int *)pc+i))
611+ printk(KERN_CONT "???????? ");
612+ else
613+ printk(KERN_CONT "%08x ", c);
614+ }
615+ printk("\n");
616+}
617+#endif
618
619 /*
620 * This routine handles page faults. It determines the address,
621@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
622 good_area:
623 si_code = SEGV_ACCERR;
624 if (cause < 0) {
625- if (!(vma->vm_flags & VM_EXEC))
626+ if (!(vma->vm_flags & VM_EXEC)) {
627+
628+#ifdef CONFIG_PAX_PAGEEXEC
629+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
630+ goto bad_area;
631+
632+ up_read(&mm->mmap_sem);
633+ switch (pax_handle_fetch_fault(regs)) {
634+
635+#ifdef CONFIG_PAX_EMUPLT
636+ case 2:
637+ case 3:
638+ return;
639+#endif
640+
641+ }
642+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
643+ do_group_exit(SIGKILL);
644+#else
645 goto bad_area;
646+#endif
647+
648+ }
649 } else if (!cause) {
650 /* Allow reads even for write-only mappings */
651 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
652diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
653index 6aac3f5..265536b 100644
654--- a/arch/arm/include/asm/elf.h
655+++ b/arch/arm/include/asm/elf.h
656@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
657 the loader. We need to make sure that it is out of the way of the program
658 that it will "exec", and that there is sufficient room for the brk. */
659
660-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
661+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
662+
663+#ifdef CONFIG_PAX_ASLR
664+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
665+
666+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
667+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
668+#endif
669
670 /* When the program starts, a1 contains a pointer to a function to be
671 registered with atexit, as per the SVR4 ABI. A value of 0 means we
672diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
673index c019949..388fdd1 100644
674--- a/arch/arm/include/asm/kmap_types.h
675+++ b/arch/arm/include/asm/kmap_types.h
676@@ -19,6 +19,7 @@ enum km_type {
677 KM_SOFTIRQ0,
678 KM_SOFTIRQ1,
679 KM_L2_CACHE,
680+ KM_CLEARPAGE,
681 KM_TYPE_NR
682 };
683
684diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
685index 1d6bd40..fba0cb9 100644
686--- a/arch/arm/include/asm/uaccess.h
687+++ b/arch/arm/include/asm/uaccess.h
688@@ -22,6 +22,8 @@
689 #define VERIFY_READ 0
690 #define VERIFY_WRITE 1
691
692+extern void check_object_size(const void *ptr, unsigned long n, bool to);
693+
694 /*
695 * The exception table consists of pairs of addresses: the first is the
696 * address of an instruction that is allowed to fault, and the second is
697@@ -387,8 +389,23 @@ do { \
698
699
700 #ifdef CONFIG_MMU
701-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
702-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
703+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
704+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
705+
706+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
707+{
708+ if (!__builtin_constant_p(n))
709+ check_object_size(to, n, false);
710+ return ___copy_from_user(to, from, n);
711+}
712+
713+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
714+{
715+ if (!__builtin_constant_p(n))
716+ check_object_size(from, n, true);
717+ return ___copy_to_user(to, from, n);
718+}
719+
720 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
721 extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
722 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
723@@ -403,6 +420,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
724
725 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
726 {
727+ if ((long)n < 0)
728+ return n;
729+
730 if (access_ok(VERIFY_READ, from, n))
731 n = __copy_from_user(to, from, n);
732 else /* security hole - plug it */
733@@ -412,6 +432,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
734
735 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
736 {
737+ if ((long)n < 0)
738+ return n;
739+
740 if (access_ok(VERIFY_WRITE, to, n))
741 n = __copy_to_user(to, from, n);
742 return n;
743diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
744index 0e62770..e2c2cd6 100644
745--- a/arch/arm/kernel/armksyms.c
746+++ b/arch/arm/kernel/armksyms.c
747@@ -118,8 +118,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
748 #ifdef CONFIG_MMU
749 EXPORT_SYMBOL(copy_page);
750
751-EXPORT_SYMBOL(__copy_from_user);
752-EXPORT_SYMBOL(__copy_to_user);
753+EXPORT_SYMBOL(___copy_from_user);
754+EXPORT_SYMBOL(___copy_to_user);
755 EXPORT_SYMBOL(__clear_user);
756
757 EXPORT_SYMBOL(__get_user_1);
758diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c
759index ba8ccfe..2dc34dc 100644
760--- a/arch/arm/kernel/kgdb.c
761+++ b/arch/arm/kernel/kgdb.c
762@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
763 * and we handle the normal undef case within the do_undefinstr
764 * handler.
765 */
766-struct kgdb_arch arch_kgdb_ops = {
767+const struct kgdb_arch arch_kgdb_ops = {
768 #ifndef __ARMEB__
769 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
770 #else /* ! __ARMEB__ */
771diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
772index 3f361a7..6e806e1 100644
773--- a/arch/arm/kernel/traps.c
774+++ b/arch/arm/kernel/traps.c
775@@ -247,6 +247,8 @@ static void __die(const char *str, int err, struct thread_info *thread, struct p
776
777 DEFINE_SPINLOCK(die_lock);
778
779+extern void gr_handle_kernel_exploit(void);
780+
781 /*
782 * This function is protected against re-entrancy.
783 */
784@@ -271,6 +273,8 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
785 if (panic_on_oops)
786 panic("Fatal exception");
787
788+ gr_handle_kernel_exploit();
789+
790 do_exit(SIGSEGV);
791 }
792
793diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
794index e4fe124..0fc246b 100644
795--- a/arch/arm/lib/copy_from_user.S
796+++ b/arch/arm/lib/copy_from_user.S
797@@ -16,7 +16,7 @@
798 /*
799 * Prototype:
800 *
801- * size_t __copy_from_user(void *to, const void *from, size_t n)
802+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
803 *
804 * Purpose:
805 *
806@@ -84,11 +84,11 @@
807
808 .text
809
810-ENTRY(__copy_from_user)
811+ENTRY(___copy_from_user)
812
813 #include "copy_template.S"
814
815-ENDPROC(__copy_from_user)
816+ENDPROC(___copy_from_user)
817
818 .section .fixup,"ax"
819 .align 0
820diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
821index 1a71e15..ac7b258 100644
822--- a/arch/arm/lib/copy_to_user.S
823+++ b/arch/arm/lib/copy_to_user.S
824@@ -16,7 +16,7 @@
825 /*
826 * Prototype:
827 *
828- * size_t __copy_to_user(void *to, const void *from, size_t n)
829+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
830 *
831 * Purpose:
832 *
833@@ -88,11 +88,11 @@
834 .text
835
836 ENTRY(__copy_to_user_std)
837-WEAK(__copy_to_user)
838+WEAK(___copy_to_user)
839
840 #include "copy_template.S"
841
842-ENDPROC(__copy_to_user)
843+ENDPROC(___copy_to_user)
844
845 .section .fixup,"ax"
846 .align 0
847diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
848index ffdd274..91017b6 100644
849--- a/arch/arm/lib/uaccess.S
850+++ b/arch/arm/lib/uaccess.S
851@@ -19,7 +19,7 @@
852
853 #define PAGE_SHIFT 12
854
855-/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)
856+/* Prototype: int ___copy_to_user(void *to, const char *from, size_t n)
857 * Purpose : copy a block to user memory from kernel memory
858 * Params : to - user memory
859 * : from - kernel memory
860@@ -39,7 +39,7 @@ USER( strgtbt r3, [r0], #1) @ May fault
861 sub r2, r2, ip
862 b .Lc2u_dest_aligned
863
864-ENTRY(__copy_to_user)
865+ENTRY(___copy_to_user)
866 stmfd sp!, {r2, r4 - r7, lr}
867 cmp r2, #4
868 blt .Lc2u_not_enough
869@@ -277,14 +277,14 @@ USER( strgebt r3, [r0], #1) @ May fault
870 ldrgtb r3, [r1], #0
871 USER( strgtbt r3, [r0], #1) @ May fault
872 b .Lc2u_finished
873-ENDPROC(__copy_to_user)
874+ENDPROC(___copy_to_user)
875
876 .section .fixup,"ax"
877 .align 0
878 9001: ldmfd sp!, {r0, r4 - r7, pc}
879 .previous
880
881-/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
882+/* Prototype: unsigned long ___copy_from_user(void *to,const void *from,unsigned long n);
883 * Purpose : copy a block from user memory to kernel memory
884 * Params : to - kernel memory
885 * : from - user memory
886@@ -303,7 +303,7 @@ USER( ldrgtbt r3, [r1], #1) @ May fault
887 sub r2, r2, ip
888 b .Lcfu_dest_aligned
889
890-ENTRY(__copy_from_user)
891+ENTRY(___copy_from_user)
892 stmfd sp!, {r0, r2, r4 - r7, lr}
893 cmp r2, #4
894 blt .Lcfu_not_enough
895@@ -543,7 +543,7 @@ USER( ldrgebt r3, [r1], #1) @ May fault
896 USER( ldrgtbt r3, [r1], #1) @ May fault
897 strgtb r3, [r0], #1
898 b .Lcfu_finished
899-ENDPROC(__copy_from_user)
900+ENDPROC(___copy_from_user)
901
902 .section .fixup,"ax"
903 .align 0
904diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
905index 6b967ff..67d5b2b 100644
906--- a/arch/arm/lib/uaccess_with_memcpy.c
907+++ b/arch/arm/lib/uaccess_with_memcpy.c
908@@ -97,7 +97,7 @@ out:
909 }
910
911 unsigned long
912-__copy_to_user(void __user *to, const void *from, unsigned long n)
913+___copy_to_user(void __user *to, const void *from, unsigned long n)
914 {
915 /*
916 * This test is stubbed out of the main function above to keep
917diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
918index 4028724..beec230 100644
919--- a/arch/arm/mach-at91/pm.c
920+++ b/arch/arm/mach-at91/pm.c
921@@ -348,7 +348,7 @@ static void at91_pm_end(void)
922 }
923
924
925-static struct platform_suspend_ops at91_pm_ops ={
926+static const struct platform_suspend_ops at91_pm_ops ={
927 .valid = at91_pm_valid_state,
928 .begin = at91_pm_begin,
929 .enter = at91_pm_enter,
930diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
931index 5218943..0a34552 100644
932--- a/arch/arm/mach-omap1/pm.c
933+++ b/arch/arm/mach-omap1/pm.c
934@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq = {
935
936
937
938-static struct platform_suspend_ops omap_pm_ops ={
939+static const struct platform_suspend_ops omap_pm_ops ={
940 .prepare = omap_pm_prepare,
941 .enter = omap_pm_enter,
942 .finish = omap_pm_finish,
943diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
944index bff5c4e..d4c649b 100644
945--- a/arch/arm/mach-omap2/pm24xx.c
946+++ b/arch/arm/mach-omap2/pm24xx.c
947@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
948 enable_hlt();
949 }
950
951-static struct platform_suspend_ops omap_pm_ops = {
952+static const struct platform_suspend_ops omap_pm_ops = {
953 .prepare = omap2_pm_prepare,
954 .enter = omap2_pm_enter,
955 .finish = omap2_pm_finish,
956diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
957index 8946319..7d3e661 100644
958--- a/arch/arm/mach-omap2/pm34xx.c
959+++ b/arch/arm/mach-omap2/pm34xx.c
960@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
961 return;
962 }
963
964-static struct platform_suspend_ops omap_pm_ops = {
965+static const struct platform_suspend_ops omap_pm_ops = {
966 .begin = omap3_pm_begin,
967 .end = omap3_pm_end,
968 .prepare = omap3_pm_prepare,
969diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c
970index b3d8d53..6e68ebc 100644
971--- a/arch/arm/mach-pnx4008/pm.c
972+++ b/arch/arm/mach-pnx4008/pm.c
973@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_state_t state)
974 (state == PM_SUSPEND_MEM);
975 }
976
977-static struct platform_suspend_ops pnx4008_pm_ops = {
978+static const struct platform_suspend_ops pnx4008_pm_ops = {
979 .enter = pnx4008_pm_enter,
980 .valid = pnx4008_pm_valid,
981 };
982diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
983index 7693355..9beb00a 100644
984--- a/arch/arm/mach-pxa/pm.c
985+++ b/arch/arm/mach-pxa/pm.c
986@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
987 pxa_cpu_pm_fns->finish();
988 }
989
990-static struct platform_suspend_ops pxa_pm_ops = {
991+static const struct platform_suspend_ops pxa_pm_ops = {
992 .valid = pxa_pm_valid,
993 .enter = pxa_pm_enter,
994 .prepare = pxa_pm_prepare,
995diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
996index 629e05d..06be589 100644
997--- a/arch/arm/mach-pxa/sharpsl_pm.c
998+++ b/arch/arm/mach-pxa/sharpsl_pm.c
999@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
1000 }
1001
1002 #ifdef CONFIG_PM
1003-static struct platform_suspend_ops sharpsl_pm_ops = {
1004+static const struct platform_suspend_ops sharpsl_pm_ops = {
1005 .prepare = pxa_pm_prepare,
1006 .finish = pxa_pm_finish,
1007 .enter = corgi_pxa_pm_enter,
1008diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
1009index c83fdc8..ab9fc44 100644
1010--- a/arch/arm/mach-sa1100/pm.c
1011+++ b/arch/arm/mach-sa1100/pm.c
1012@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
1013 return virt_to_phys(sp);
1014 }
1015
1016-static struct platform_suspend_ops sa11x0_pm_ops = {
1017+static const struct platform_suspend_ops sa11x0_pm_ops = {
1018 .enter = sa11x0_pm_enter,
1019 .valid = suspend_valid_only_mem,
1020 };
1021diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
1022index 3191cd6..c0739db 100644
1023--- a/arch/arm/mm/fault.c
1024+++ b/arch/arm/mm/fault.c
1025@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
1026 }
1027 #endif
1028
1029+#ifdef CONFIG_PAX_PAGEEXEC
1030+ if (fsr & FSR_LNX_PF) {
1031+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
1032+ do_group_exit(SIGKILL);
1033+ }
1034+#endif
1035+
1036 tsk->thread.address = addr;
1037 tsk->thread.error_code = fsr;
1038 tsk->thread.trap_no = 14;
1039@@ -357,6 +364,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
1040 }
1041 #endif /* CONFIG_MMU */
1042
1043+#ifdef CONFIG_PAX_PAGEEXEC
1044+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1045+{
1046+ long i;
1047+
1048+ printk(KERN_ERR "PAX: bytes at PC: ");
1049+ for (i = 0; i < 20; i++) {
1050+ unsigned char c;
1051+ if (get_user(c, (__force unsigned char __user *)pc+i))
1052+ printk(KERN_CONT "?? ");
1053+ else
1054+ printk(KERN_CONT "%02x ", c);
1055+ }
1056+ printk("\n");
1057+
1058+ printk(KERN_ERR "PAX: bytes at SP-4: ");
1059+ for (i = -1; i < 20; i++) {
1060+ unsigned long c;
1061+ if (get_user(c, (__force unsigned long __user *)sp+i))
1062+ printk(KERN_CONT "???????? ");
1063+ else
1064+ printk(KERN_CONT "%08lx ", c);
1065+ }
1066+ printk("\n");
1067+}
1068+#endif
1069+
1070 /*
1071 * First Level Translation Fault Handler
1072 *
1073diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
1074index f5abc51..7ec524c 100644
1075--- a/arch/arm/mm/mmap.c
1076+++ b/arch/arm/mm/mmap.c
1077@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1078 if (len > TASK_SIZE)
1079 return -ENOMEM;
1080
1081+#ifdef CONFIG_PAX_RANDMMAP
1082+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
1083+#endif
1084+
1085 if (addr) {
1086 if (do_align)
1087 addr = COLOUR_ALIGN(addr, pgoff);
1088@@ -70,15 +74,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1089 addr = PAGE_ALIGN(addr);
1090
1091 vma = find_vma(mm, addr);
1092- if (TASK_SIZE - len >= addr &&
1093- (!vma || addr + len <= vma->vm_start))
1094+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1095 return addr;
1096 }
1097 if (len > mm->cached_hole_size) {
1098- start_addr = addr = mm->free_area_cache;
1099+ start_addr = addr = mm->free_area_cache;
1100 } else {
1101- start_addr = addr = TASK_UNMAPPED_BASE;
1102- mm->cached_hole_size = 0;
1103+ start_addr = addr = mm->mmap_base;
1104+ mm->cached_hole_size = 0;
1105 }
1106
1107 full_search:
1108@@ -94,14 +97,14 @@ full_search:
1109 * Start a new search - just in case we missed
1110 * some holes.
1111 */
1112- if (start_addr != TASK_UNMAPPED_BASE) {
1113- start_addr = addr = TASK_UNMAPPED_BASE;
1114+ if (start_addr != mm->mmap_base) {
1115+ start_addr = addr = mm->mmap_base;
1116 mm->cached_hole_size = 0;
1117 goto full_search;
1118 }
1119 return -ENOMEM;
1120 }
1121- if (!vma || addr + len <= vma->vm_start) {
1122+ if (check_heap_stack_gap(vma, addr, len)) {
1123 /*
1124 * Remember the place where we stopped the search:
1125 */
1126diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c
1127index 8d97db2..b66cfa5 100644
1128--- a/arch/arm/plat-s3c/pm.c
1129+++ b/arch/arm/plat-s3c/pm.c
1130@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
1131 s3c_pm_check_cleanup();
1132 }
1133
1134-static struct platform_suspend_ops s3c_pm_ops = {
1135+static const struct platform_suspend_ops s3c_pm_ops = {
1136 .enter = s3c_pm_enter,
1137 .prepare = s3c_pm_prepare,
1138 .finish = s3c_pm_finish,
1139diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
1140index d5d1d41..856e2ed 100644
1141--- a/arch/avr32/include/asm/elf.h
1142+++ b/arch/avr32/include/asm/elf.h
1143@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
1144 the loader. We need to make sure that it is out of the way of the program
1145 that it will "exec", and that there is sufficient room for the brk. */
1146
1147-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1148+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1149
1150+#ifdef CONFIG_PAX_ASLR
1151+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
1152+
1153+#define PAX_DELTA_MMAP_LEN 15
1154+#define PAX_DELTA_STACK_LEN 15
1155+#endif
1156
1157 /* This yields a mask that user programs can use to figure out what
1158 instruction set this CPU supports. This could be done in user space,
1159diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
1160index b7f5c68..556135c 100644
1161--- a/arch/avr32/include/asm/kmap_types.h
1162+++ b/arch/avr32/include/asm/kmap_types.h
1163@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
1164 D(11) KM_IRQ1,
1165 D(12) KM_SOFTIRQ0,
1166 D(13) KM_SOFTIRQ1,
1167-D(14) KM_TYPE_NR
1168+D(14) KM_CLEARPAGE,
1169+D(15) KM_TYPE_NR
1170 };
1171
1172 #undef D
1173diff --git a/arch/avr32/mach-at32ap/pm.c b/arch/avr32/mach-at32ap/pm.c
1174index f021edf..32d680e 100644
1175--- a/arch/avr32/mach-at32ap/pm.c
1176+++ b/arch/avr32/mach-at32ap/pm.c
1177@@ -176,7 +176,7 @@ out:
1178 return 0;
1179 }
1180
1181-static struct platform_suspend_ops avr32_pm_ops = {
1182+static const struct platform_suspend_ops avr32_pm_ops = {
1183 .valid = avr32_pm_valid_state,
1184 .enter = avr32_pm_enter,
1185 };
1186diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
1187index b61d86d..e292c7f 100644
1188--- a/arch/avr32/mm/fault.c
1189+++ b/arch/avr32/mm/fault.c
1190@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
1191
1192 int exception_trace = 1;
1193
1194+#ifdef CONFIG_PAX_PAGEEXEC
1195+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1196+{
1197+ unsigned long i;
1198+
1199+ printk(KERN_ERR "PAX: bytes at PC: ");
1200+ for (i = 0; i < 20; i++) {
1201+ unsigned char c;
1202+ if (get_user(c, (unsigned char *)pc+i))
1203+ printk(KERN_CONT "???????? ");
1204+ else
1205+ printk(KERN_CONT "%02x ", c);
1206+ }
1207+ printk("\n");
1208+}
1209+#endif
1210+
1211 /*
1212 * This routine handles page faults. It determines the address and the
1213 * problem, and then passes it off to one of the appropriate routines.
1214@@ -157,6 +174,16 @@ bad_area:
1215 up_read(&mm->mmap_sem);
1216
1217 if (user_mode(regs)) {
1218+
1219+#ifdef CONFIG_PAX_PAGEEXEC
1220+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
1221+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
1222+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
1223+ do_group_exit(SIGKILL);
1224+ }
1225+ }
1226+#endif
1227+
1228 if (exception_trace && printk_ratelimit())
1229 printk("%s%s[%d]: segfault at %08lx pc %08lx "
1230 "sp %08lx ecr %lu\n",
1231diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c
1232index cce79d0..c406c85 100644
1233--- a/arch/blackfin/kernel/kgdb.c
1234+++ b/arch/blackfin/kernel/kgdb.c
1235@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vector, int signo,
1236 return -1; /* this means that we do not want to exit from the handler */
1237 }
1238
1239-struct kgdb_arch arch_kgdb_ops = {
1240+const struct kgdb_arch arch_kgdb_ops = {
1241 .gdb_bpt_instr = {0xa1},
1242 #ifdef CONFIG_SMP
1243 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
1244diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
1245index 8837be4..b2fb413 100644
1246--- a/arch/blackfin/mach-common/pm.c
1247+++ b/arch/blackfin/mach-common/pm.c
1248@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t state)
1249 return 0;
1250 }
1251
1252-struct platform_suspend_ops bfin_pm_ops = {
1253+const struct platform_suspend_ops bfin_pm_ops = {
1254 .enter = bfin_pm_enter,
1255 .valid = bfin_pm_valid,
1256 };
1257diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
1258index f8e16b2..c73ff79 100644
1259--- a/arch/frv/include/asm/kmap_types.h
1260+++ b/arch/frv/include/asm/kmap_types.h
1261@@ -23,6 +23,7 @@ enum km_type {
1262 KM_IRQ1,
1263 KM_SOFTIRQ0,
1264 KM_SOFTIRQ1,
1265+ KM_CLEARPAGE,
1266 KM_TYPE_NR
1267 };
1268
1269diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
1270index 385fd30..6c3d97e 100644
1271--- a/arch/frv/mm/elf-fdpic.c
1272+++ b/arch/frv/mm/elf-fdpic.c
1273@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
1274 if (addr) {
1275 addr = PAGE_ALIGN(addr);
1276 vma = find_vma(current->mm, addr);
1277- if (TASK_SIZE - len >= addr &&
1278- (!vma || addr + len <= vma->vm_start))
1279+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1280 goto success;
1281 }
1282
1283@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
1284 for (; vma; vma = vma->vm_next) {
1285 if (addr > limit)
1286 break;
1287- if (addr + len <= vma->vm_start)
1288+ if (check_heap_stack_gap(vma, addr, len))
1289 goto success;
1290 addr = vma->vm_end;
1291 }
1292@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
1293 for (; vma; vma = vma->vm_next) {
1294 if (addr > limit)
1295 break;
1296- if (addr + len <= vma->vm_start)
1297+ if (check_heap_stack_gap(vma, addr, len))
1298 goto success;
1299 addr = vma->vm_end;
1300 }
1301diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
1302index e4a80d8..11a7ea1 100644
1303--- a/arch/ia64/hp/common/hwsw_iommu.c
1304+++ b/arch/ia64/hp/common/hwsw_iommu.c
1305@@ -17,7 +17,7 @@
1306 #include <linux/swiotlb.h>
1307 #include <asm/machvec.h>
1308
1309-extern struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
1310+extern const struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
1311
1312 /* swiotlb declarations & definitions: */
1313 extern int swiotlb_late_init_with_default_size (size_t size);
1314@@ -33,7 +33,7 @@ static inline int use_swiotlb(struct device *dev)
1315 !sba_dma_ops.dma_supported(dev, *dev->dma_mask);
1316 }
1317
1318-struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
1319+const struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
1320 {
1321 if (use_swiotlb(dev))
1322 return &swiotlb_dma_ops;
1323diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
1324index 01ae69b..35752fd 100644
1325--- a/arch/ia64/hp/common/sba_iommu.c
1326+++ b/arch/ia64/hp/common/sba_iommu.c
1327@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_driver = {
1328 },
1329 };
1330
1331-extern struct dma_map_ops swiotlb_dma_ops;
1332+extern const struct dma_map_ops swiotlb_dma_ops;
1333
1334 static int __init
1335 sba_init(void)
1336@@ -2211,7 +2211,7 @@ sba_page_override(char *str)
1337
1338 __setup("sbapagesize=",sba_page_override);
1339
1340-struct dma_map_ops sba_dma_ops = {
1341+const struct dma_map_ops sba_dma_ops = {
1342 .alloc_coherent = sba_alloc_coherent,
1343 .free_coherent = sba_free_coherent,
1344 .map_page = sba_map_page,
1345diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
1346index c69552b..c7122f4 100644
1347--- a/arch/ia64/ia32/binfmt_elf32.c
1348+++ b/arch/ia64/ia32/binfmt_elf32.c
1349@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_top);
1350
1351 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
1352
1353+#ifdef CONFIG_PAX_ASLR
1354+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
1355+
1356+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
1357+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
1358+#endif
1359+
1360 /* Ugly but avoids duplication */
1361 #include "../../../fs/binfmt_elf.c"
1362
1363diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h
1364index 0f15349..26b3429 100644
1365--- a/arch/ia64/ia32/ia32priv.h
1366+++ b/arch/ia64/ia32/ia32priv.h
1367@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
1368 #define ELF_DATA ELFDATA2LSB
1369 #define ELF_ARCH EM_386
1370
1371-#define IA32_STACK_TOP IA32_PAGE_OFFSET
1372+#ifdef CONFIG_PAX_RANDUSTACK
1373+#define __IA32_DELTA_STACK (current->mm->delta_stack)
1374+#else
1375+#define __IA32_DELTA_STACK 0UL
1376+#endif
1377+
1378+#define IA32_STACK_TOP (IA32_PAGE_OFFSET - __IA32_DELTA_STACK)
1379+
1380 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET
1381 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
1382
1383diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
1384index 8d3c79c..71b3af6 100644
1385--- a/arch/ia64/include/asm/dma-mapping.h
1386+++ b/arch/ia64/include/asm/dma-mapping.h
1387@@ -12,7 +12,7 @@
1388
1389 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
1390
1391-extern struct dma_map_ops *dma_ops;
1392+extern const struct dma_map_ops *dma_ops;
1393 extern struct ia64_machine_vector ia64_mv;
1394 extern void set_iommu_machvec(void);
1395
1396@@ -24,7 +24,7 @@ extern void machvec_dma_sync_sg(struct device *, struct scatterlist *, int,
1397 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
1398 dma_addr_t *daddr, gfp_t gfp)
1399 {
1400- struct dma_map_ops *ops = platform_dma_get_ops(dev);
1401+ const struct dma_map_ops *ops = platform_dma_get_ops(dev);
1402 void *caddr;
1403
1404 caddr = ops->alloc_coherent(dev, size, daddr, gfp);
1405@@ -35,7 +35,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
1406 static inline void dma_free_coherent(struct device *dev, size_t size,
1407 void *caddr, dma_addr_t daddr)
1408 {
1409- struct dma_map_ops *ops = platform_dma_get_ops(dev);
1410+ const struct dma_map_ops *ops = platform_dma_get_ops(dev);
1411 debug_dma_free_coherent(dev, size, caddr, daddr);
1412 ops->free_coherent(dev, size, caddr, daddr);
1413 }
1414@@ -49,13 +49,13 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
1415
1416 static inline int dma_mapping_error(struct device *dev, dma_addr_t daddr)
1417 {
1418- struct dma_map_ops *ops = platform_dma_get_ops(dev);
1419+ const struct dma_map_ops *ops = platform_dma_get_ops(dev);
1420 return ops->mapping_error(dev, daddr);
1421 }
1422
1423 static inline int dma_supported(struct device *dev, u64 mask)
1424 {
1425- struct dma_map_ops *ops = platform_dma_get_ops(dev);
1426+ const struct dma_map_ops *ops = platform_dma_get_ops(dev);
1427 return ops->dma_supported(dev, mask);
1428 }
1429
1430diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
1431index 86eddee..b116bb4 100644
1432--- a/arch/ia64/include/asm/elf.h
1433+++ b/arch/ia64/include/asm/elf.h
1434@@ -43,6 +43,13 @@
1435 */
1436 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
1437
1438+#ifdef CONFIG_PAX_ASLR
1439+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
1440+
1441+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
1442+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
1443+#endif
1444+
1445 #define PT_IA_64_UNWIND 0x70000001
1446
1447 /* IA-64 relocations: */
1448diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h
1449index 367d299..9ad4279 100644
1450--- a/arch/ia64/include/asm/machvec.h
1451+++ b/arch/ia64/include/asm/machvec.h
1452@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event_t(void);
1453 /* DMA-mapping interface: */
1454 typedef void ia64_mv_dma_init (void);
1455 typedef u64 ia64_mv_dma_get_required_mask (struct device *);
1456-typedef struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);
1457+typedef const struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);
1458
1459 /*
1460 * WARNING: The legacy I/O space is _architected_. Platforms are
1461@@ -251,7 +251,7 @@ extern void machvec_init_from_cmdline(const char *cmdline);
1462 # endif /* CONFIG_IA64_GENERIC */
1463
1464 extern void swiotlb_dma_init(void);
1465-extern struct dma_map_ops *dma_get_ops(struct device *);
1466+extern const struct dma_map_ops *dma_get_ops(struct device *);
1467
1468 /*
1469 * Define default versions so we can extend machvec for new platforms without having
1470diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
1471index 8840a69..cdb63d9 100644
1472--- a/arch/ia64/include/asm/pgtable.h
1473+++ b/arch/ia64/include/asm/pgtable.h
1474@@ -12,7 +12,7 @@
1475 * David Mosberger-Tang <davidm@hpl.hp.com>
1476 */
1477
1478-
1479+#include <linux/const.h>
1480 #include <asm/mman.h>
1481 #include <asm/page.h>
1482 #include <asm/processor.h>
1483@@ -143,6 +143,17 @@
1484 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1485 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1486 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
1487+
1488+#ifdef CONFIG_PAX_PAGEEXEC
1489+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
1490+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1491+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1492+#else
1493+# define PAGE_SHARED_NOEXEC PAGE_SHARED
1494+# define PAGE_READONLY_NOEXEC PAGE_READONLY
1495+# define PAGE_COPY_NOEXEC PAGE_COPY
1496+#endif
1497+
1498 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
1499 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
1500 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
1501diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
1502index 239ecdc..f94170e 100644
1503--- a/arch/ia64/include/asm/spinlock.h
1504+++ b/arch/ia64/include/asm/spinlock.h
1505@@ -72,7 +72,7 @@ static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock)
1506 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
1507
1508 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
1509- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
1510+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
1511 }
1512
1513 static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock)
1514diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
1515index 449c8c0..432a3d2 100644
1516--- a/arch/ia64/include/asm/uaccess.h
1517+++ b/arch/ia64/include/asm/uaccess.h
1518@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
1519 const void *__cu_from = (from); \
1520 long __cu_len = (n); \
1521 \
1522- if (__access_ok(__cu_to, __cu_len, get_fs())) \
1523+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
1524 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
1525 __cu_len; \
1526 })
1527@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
1528 long __cu_len = (n); \
1529 \
1530 __chk_user_ptr(__cu_from); \
1531- if (__access_ok(__cu_from, __cu_len, get_fs())) \
1532+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
1533 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
1534 __cu_len; \
1535 })
1536diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c
1537index f2c1600..969398a 100644
1538--- a/arch/ia64/kernel/dma-mapping.c
1539+++ b/arch/ia64/kernel/dma-mapping.c
1540@@ -3,7 +3,7 @@
1541 /* Set this to 1 if there is a HW IOMMU in the system */
1542 int iommu_detected __read_mostly;
1543
1544-struct dma_map_ops *dma_ops;
1545+const struct dma_map_ops *dma_ops;
1546 EXPORT_SYMBOL(dma_ops);
1547
1548 #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
1549@@ -16,7 +16,7 @@ static int __init dma_init(void)
1550 }
1551 fs_initcall(dma_init);
1552
1553-struct dma_map_ops *dma_get_ops(struct device *dev)
1554+const struct dma_map_ops *dma_get_ops(struct device *dev)
1555 {
1556 return dma_ops;
1557 }
1558diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
1559index 1481b0a..e7d38ff 100644
1560--- a/arch/ia64/kernel/module.c
1561+++ b/arch/ia64/kernel/module.c
1562@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
1563 void
1564 module_free (struct module *mod, void *module_region)
1565 {
1566- if (mod && mod->arch.init_unw_table &&
1567- module_region == mod->module_init) {
1568+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
1569 unw_remove_unwind_table(mod->arch.init_unw_table);
1570 mod->arch.init_unw_table = NULL;
1571 }
1572@@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
1573 }
1574
1575 static inline int
1576+in_init_rx (const struct module *mod, uint64_t addr)
1577+{
1578+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
1579+}
1580+
1581+static inline int
1582+in_init_rw (const struct module *mod, uint64_t addr)
1583+{
1584+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
1585+}
1586+
1587+static inline int
1588 in_init (const struct module *mod, uint64_t addr)
1589 {
1590- return addr - (uint64_t) mod->module_init < mod->init_size;
1591+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
1592+}
1593+
1594+static inline int
1595+in_core_rx (const struct module *mod, uint64_t addr)
1596+{
1597+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
1598+}
1599+
1600+static inline int
1601+in_core_rw (const struct module *mod, uint64_t addr)
1602+{
1603+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
1604 }
1605
1606 static inline int
1607 in_core (const struct module *mod, uint64_t addr)
1608 {
1609- return addr - (uint64_t) mod->module_core < mod->core_size;
1610+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
1611 }
1612
1613 static inline int
1614@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
1615 break;
1616
1617 case RV_BDREL:
1618- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
1619+ if (in_init_rx(mod, val))
1620+ val -= (uint64_t) mod->module_init_rx;
1621+ else if (in_init_rw(mod, val))
1622+ val -= (uint64_t) mod->module_init_rw;
1623+ else if (in_core_rx(mod, val))
1624+ val -= (uint64_t) mod->module_core_rx;
1625+ else if (in_core_rw(mod, val))
1626+ val -= (uint64_t) mod->module_core_rw;
1627 break;
1628
1629 case RV_LTV:
1630@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
1631 * addresses have been selected...
1632 */
1633 uint64_t gp;
1634- if (mod->core_size > MAX_LTOFF)
1635+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
1636 /*
1637 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
1638 * at the end of the module.
1639 */
1640- gp = mod->core_size - MAX_LTOFF / 2;
1641+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
1642 else
1643- gp = mod->core_size / 2;
1644- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
1645+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
1646+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
1647 mod->arch.gp = gp;
1648 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
1649 }
1650diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
1651index f6b1ff0..de773fb 100644
1652--- a/arch/ia64/kernel/pci-dma.c
1653+++ b/arch/ia64/kernel/pci-dma.c
1654@@ -43,7 +43,7 @@ struct device fallback_dev = {
1655 .dma_mask = &fallback_dev.coherent_dma_mask,
1656 };
1657
1658-extern struct dma_map_ops intel_dma_ops;
1659+extern const struct dma_map_ops intel_dma_ops;
1660
1661 static int __init pci_iommu_init(void)
1662 {
1663@@ -96,15 +96,34 @@ int iommu_dma_supported(struct device *dev, u64 mask)
1664 }
1665 EXPORT_SYMBOL(iommu_dma_supported);
1666
1667+extern void *intel_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t flags);
1668+extern void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, dma_addr_t dma_handle);
1669+extern int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs);
1670+extern void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs);
1671+extern dma_addr_t intel_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, struct dma_attrs *attrs);
1672+extern void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, size_t size, enum dma_data_direction dir, struct dma_attrs *attrs);
1673+extern int intel_mapping_error(struct device *dev, dma_addr_t dma_addr);
1674+
1675+static const struct dma_map_ops intel_iommu_dma_ops = {
1676+ /* from drivers/pci/intel-iommu.c:intel_dma_ops */
1677+ .alloc_coherent = intel_alloc_coherent,
1678+ .free_coherent = intel_free_coherent,
1679+ .map_sg = intel_map_sg,
1680+ .unmap_sg = intel_unmap_sg,
1681+ .map_page = intel_map_page,
1682+ .unmap_page = intel_unmap_page,
1683+ .mapping_error = intel_mapping_error,
1684+
1685+ .sync_single_for_cpu = machvec_dma_sync_single,
1686+ .sync_sg_for_cpu = machvec_dma_sync_sg,
1687+ .sync_single_for_device = machvec_dma_sync_single,
1688+ .sync_sg_for_device = machvec_dma_sync_sg,
1689+ .dma_supported = iommu_dma_supported,
1690+};
1691+
1692 void __init pci_iommu_alloc(void)
1693 {
1694- dma_ops = &intel_dma_ops;
1695-
1696- dma_ops->sync_single_for_cpu = machvec_dma_sync_single;
1697- dma_ops->sync_sg_for_cpu = machvec_dma_sync_sg;
1698- dma_ops->sync_single_for_device = machvec_dma_sync_single;
1699- dma_ops->sync_sg_for_device = machvec_dma_sync_sg;
1700- dma_ops->dma_supported = iommu_dma_supported;
1701+ dma_ops = &intel_iommu_dma_ops;
1702
1703 /*
1704 * The order of these functions is important for
1705diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
1706index 285aae8..61dbab6 100644
1707--- a/arch/ia64/kernel/pci-swiotlb.c
1708+++ b/arch/ia64/kernel/pci-swiotlb.c
1709@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent(struct device *dev, size_t size,
1710 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
1711 }
1712
1713-struct dma_map_ops swiotlb_dma_ops = {
1714+const struct dma_map_ops swiotlb_dma_ops = {
1715 .alloc_coherent = ia64_swiotlb_alloc_coherent,
1716 .free_coherent = swiotlb_free_coherent,
1717 .map_page = swiotlb_map_page,
1718diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
1719index 609d500..7dde2a8 100644
1720--- a/arch/ia64/kernel/sys_ia64.c
1721+++ b/arch/ia64/kernel/sys_ia64.c
1722@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
1723 if (REGION_NUMBER(addr) == RGN_HPAGE)
1724 addr = 0;
1725 #endif
1726+
1727+#ifdef CONFIG_PAX_RANDMMAP
1728+ if (mm->pax_flags & MF_PAX_RANDMMAP)
1729+ addr = mm->free_area_cache;
1730+ else
1731+#endif
1732+
1733 if (!addr)
1734 addr = mm->free_area_cache;
1735
1736@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
1737 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
1738 /* At this point: (!vma || addr < vma->vm_end). */
1739 if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
1740- if (start_addr != TASK_UNMAPPED_BASE) {
1741+ if (start_addr != mm->mmap_base) {
1742 /* Start a new search --- just in case we missed some holes. */
1743- addr = TASK_UNMAPPED_BASE;
1744+ addr = mm->mmap_base;
1745 goto full_search;
1746 }
1747 return -ENOMEM;
1748 }
1749- if (!vma || addr + len <= vma->vm_start) {
1750+ if (check_heap_stack_gap(vma, addr, len)) {
1751 /* Remember the address where we stopped this search: */
1752 mm->free_area_cache = addr + len;
1753 return addr;
1754diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
1755index 8f06035..b3a5818 100644
1756--- a/arch/ia64/kernel/topology.c
1757+++ b/arch/ia64/kernel/topology.c
1758@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject * kobj, struct attribute * attr, char *
1759 return ret;
1760 }
1761
1762-static struct sysfs_ops cache_sysfs_ops = {
1763+static const struct sysfs_ops cache_sysfs_ops = {
1764 .show = cache_show
1765 };
1766
1767diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
1768index 0a0c77b..8e55a81 100644
1769--- a/arch/ia64/kernel/vmlinux.lds.S
1770+++ b/arch/ia64/kernel/vmlinux.lds.S
1771@@ -190,7 +190,7 @@ SECTIONS
1772 /* Per-cpu data: */
1773 . = ALIGN(PERCPU_PAGE_SIZE);
1774 PERCPU_VADDR(PERCPU_ADDR, :percpu)
1775- __phys_per_cpu_start = __per_cpu_load;
1776+ __phys_per_cpu_start = per_cpu_load;
1777 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
1778 * into percpu page size
1779 */
1780diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
1781index 19261a9..1611b7a 100644
1782--- a/arch/ia64/mm/fault.c
1783+++ b/arch/ia64/mm/fault.c
1784@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
1785 return pte_present(pte);
1786 }
1787
1788+#ifdef CONFIG_PAX_PAGEEXEC
1789+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1790+{
1791+ unsigned long i;
1792+
1793+ printk(KERN_ERR "PAX: bytes at PC: ");
1794+ for (i = 0; i < 8; i++) {
1795+ unsigned int c;
1796+ if (get_user(c, (unsigned int *)pc+i))
1797+ printk(KERN_CONT "???????? ");
1798+ else
1799+ printk(KERN_CONT "%08x ", c);
1800+ }
1801+ printk("\n");
1802+}
1803+#endif
1804+
1805 void __kprobes
1806 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
1807 {
1808@@ -145,9 +162,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
1809 mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
1810 | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
1811
1812- if ((vma->vm_flags & mask) != mask)
1813+ if ((vma->vm_flags & mask) != mask) {
1814+
1815+#ifdef CONFIG_PAX_PAGEEXEC
1816+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
1817+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
1818+ goto bad_area;
1819+
1820+ up_read(&mm->mmap_sem);
1821+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
1822+ do_group_exit(SIGKILL);
1823+ }
1824+#endif
1825+
1826 goto bad_area;
1827
1828+ }
1829+
1830 survive:
1831 /*
1832 * If for any reason at all we couldn't handle the fault, make
1833diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
1834index b0f6157..a082bbc 100644
1835--- a/arch/ia64/mm/hugetlbpage.c
1836+++ b/arch/ia64/mm/hugetlbpage.c
1837@@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
1838 /* At this point: (!vmm || addr < vmm->vm_end). */
1839 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
1840 return -ENOMEM;
1841- if (!vmm || (addr + len) <= vmm->vm_start)
1842+ if (check_heap_stack_gap(vmm, addr, len))
1843 return addr;
1844 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
1845 }
1846diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
1847index 1857766..05cc6a3 100644
1848--- a/arch/ia64/mm/init.c
1849+++ b/arch/ia64/mm/init.c
1850@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
1851 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
1852 vma->vm_end = vma->vm_start + PAGE_SIZE;
1853 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
1854+
1855+#ifdef CONFIG_PAX_PAGEEXEC
1856+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
1857+ vma->vm_flags &= ~VM_EXEC;
1858+
1859+#ifdef CONFIG_PAX_MPROTECT
1860+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
1861+ vma->vm_flags &= ~VM_MAYEXEC;
1862+#endif
1863+
1864+ }
1865+#endif
1866+
1867 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1868 down_write(&current->mm->mmap_sem);
1869 if (insert_vm_struct(current->mm, vma)) {
1870diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
1871index 98b6849..8046766 100644
1872--- a/arch/ia64/sn/pci/pci_dma.c
1873+++ b/arch/ia64/sn/pci/pci_dma.c
1874@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size)
1875 return ret;
1876 }
1877
1878-static struct dma_map_ops sn_dma_ops = {
1879+static const struct dma_map_ops sn_dma_ops = {
1880 .alloc_coherent = sn_dma_alloc_coherent,
1881 .free_coherent = sn_dma_free_coherent,
1882 .map_page = sn_dma_map_page,
1883diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
1884index 82abd15..d95ae5d 100644
1885--- a/arch/m32r/lib/usercopy.c
1886+++ b/arch/m32r/lib/usercopy.c
1887@@ -14,6 +14,9 @@
1888 unsigned long
1889 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
1890 {
1891+ if ((long)n < 0)
1892+ return n;
1893+
1894 prefetch(from);
1895 if (access_ok(VERIFY_WRITE, to, n))
1896 __copy_user(to,from,n);
1897@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
1898 unsigned long
1899 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
1900 {
1901+ if ((long)n < 0)
1902+ return n;
1903+
1904 prefetchw(to);
1905 if (access_ok(VERIFY_READ, from, n))
1906 __copy_user_zeroing(to,from,n);
1907diff --git a/arch/mips/Makefile b/arch/mips/Makefile
1908index 77f5021..2b1db8a 100644
1909--- a/arch/mips/Makefile
1910+++ b/arch/mips/Makefile
1911@@ -51,6 +51,8 @@ endif
1912 cflags-y := -ffunction-sections
1913 cflags-y += $(call cc-option, -mno-check-zero-division)
1914
1915+cflags-y += -Wno-sign-compare -Wno-extra
1916+
1917 ifdef CONFIG_32BIT
1918 ld-emul = $(32bit-emul)
1919 vmlinux-32 = vmlinux
1920diff --git a/arch/mips/alchemy/devboards/pm.c b/arch/mips/alchemy/devboards/pm.c
1921index 632f986..fd0378d 100644
1922--- a/arch/mips/alchemy/devboards/pm.c
1923+++ b/arch/mips/alchemy/devboards/pm.c
1924@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
1925
1926 }
1927
1928-static struct platform_suspend_ops db1x_pm_ops = {
1929+static const struct platform_suspend_ops db1x_pm_ops = {
1930 .valid = suspend_valid_only_mem,
1931 .begin = db1x_pm_begin,
1932 .enter = db1x_pm_enter,
1933diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
1934index 7990694..4e93acf 100644
1935--- a/arch/mips/include/asm/elf.h
1936+++ b/arch/mips/include/asm/elf.h
1937@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *);
1938 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1939 #endif
1940
1941+#ifdef CONFIG_PAX_ASLR
1942+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
1943+
1944+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1945+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1946+#endif
1947+
1948 #endif /* _ASM_ELF_H */
1949diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
1950index f266295..627cfff 100644
1951--- a/arch/mips/include/asm/page.h
1952+++ b/arch/mips/include/asm/page.h
1953@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
1954 #ifdef CONFIG_CPU_MIPS32
1955 typedef struct { unsigned long pte_low, pte_high; } pte_t;
1956 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
1957- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
1958+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
1959 #else
1960 typedef struct { unsigned long long pte; } pte_t;
1961 #define pte_val(x) ((x).pte)
1962diff --git a/arch/mips/include/asm/reboot.h b/arch/mips/include/asm/reboot.h
1963index e48c0bf..f3acf65 100644
1964--- a/arch/mips/include/asm/reboot.h
1965+++ b/arch/mips/include/asm/reboot.h
1966@@ -9,7 +9,7 @@
1967 #ifndef _ASM_REBOOT_H
1968 #define _ASM_REBOOT_H
1969
1970-extern void (*_machine_restart)(char *command);
1971-extern void (*_machine_halt)(void);
1972+extern void (*__noreturn _machine_restart)(char *command);
1973+extern void (*__noreturn _machine_halt)(void);
1974
1975 #endif /* _ASM_REBOOT_H */
1976diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
1977index 83b5509..9fa24a23 100644
1978--- a/arch/mips/include/asm/system.h
1979+++ b/arch/mips/include/asm/system.h
1980@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
1981 */
1982 #define __ARCH_WANT_UNLOCKED_CTXSW
1983
1984-extern unsigned long arch_align_stack(unsigned long sp);
1985+#define arch_align_stack(x) ((x) & ~0xfUL)
1986
1987 #endif /* _ASM_SYSTEM_H */
1988diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
1989index 9fdd8bc..fcf9d68 100644
1990--- a/arch/mips/kernel/binfmt_elfn32.c
1991+++ b/arch/mips/kernel/binfmt_elfn32.c
1992@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
1993 #undef ELF_ET_DYN_BASE
1994 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
1995
1996+#ifdef CONFIG_PAX_ASLR
1997+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
1998+
1999+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2000+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2001+#endif
2002+
2003 #include <asm/processor.h>
2004 #include <linux/module.h>
2005 #include <linux/elfcore.h>
2006diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
2007index ff44823..cf0b48a 100644
2008--- a/arch/mips/kernel/binfmt_elfo32.c
2009+++ b/arch/mips/kernel/binfmt_elfo32.c
2010@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2011 #undef ELF_ET_DYN_BASE
2012 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2013
2014+#ifdef CONFIG_PAX_ASLR
2015+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
2016+
2017+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2018+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2019+#endif
2020+
2021 #include <asm/processor.h>
2022
2023 /*
2024diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c
2025index 50c9bb8..efdd5f8 100644
2026--- a/arch/mips/kernel/kgdb.c
2027+++ b/arch/mips/kernel/kgdb.c
2028@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
2029 return -1;
2030 }
2031
2032+/* cannot be const */
2033 struct kgdb_arch arch_kgdb_ops;
2034
2035 /*
2036diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
2037index f3d73e1..bb3f57a 100644
2038--- a/arch/mips/kernel/process.c
2039+++ b/arch/mips/kernel/process.c
2040@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_struct *task)
2041 out:
2042 return pc;
2043 }
2044-
2045-/*
2046- * Don't forget that the stack pointer must be aligned on a 8 bytes
2047- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
2048- */
2049-unsigned long arch_align_stack(unsigned long sp)
2050-{
2051- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
2052- sp -= get_random_int() & ~PAGE_MASK;
2053-
2054- return sp & ALMASK;
2055-}
2056diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
2057index 060563a..7fbf310 100644
2058--- a/arch/mips/kernel/reset.c
2059+++ b/arch/mips/kernel/reset.c
2060@@ -19,8 +19,8 @@
2061 * So handle all using function pointers to machine specific
2062 * functions.
2063 */
2064-void (*_machine_restart)(char *command);
2065-void (*_machine_halt)(void);
2066+void (*__noreturn _machine_restart)(char *command);
2067+void (*__noreturn _machine_halt)(void);
2068 void (*pm_power_off)(void);
2069
2070 EXPORT_SYMBOL(pm_power_off);
2071@@ -29,16 +29,19 @@ void machine_restart(char *command)
2072 {
2073 if (_machine_restart)
2074 _machine_restart(command);
2075+ BUG();
2076 }
2077
2078 void machine_halt(void)
2079 {
2080 if (_machine_halt)
2081 _machine_halt();
2082+ BUG();
2083 }
2084
2085 void machine_power_off(void)
2086 {
2087 if (pm_power_off)
2088 pm_power_off();
2089+ BUG();
2090 }
2091diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
2092index 3f7f466..3abe0b5 100644
2093--- a/arch/mips/kernel/syscall.c
2094+++ b/arch/mips/kernel/syscall.c
2095@@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
2096 do_color_align = 0;
2097 if (filp || (flags & MAP_SHARED))
2098 do_color_align = 1;
2099+
2100+#ifdef CONFIG_PAX_RANDMMAP
2101+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
2102+#endif
2103+
2104 if (addr) {
2105 if (do_color_align)
2106 addr = COLOUR_ALIGN(addr, pgoff);
2107 else
2108 addr = PAGE_ALIGN(addr);
2109 vmm = find_vma(current->mm, addr);
2110- if (task_size - len >= addr &&
2111- (!vmm || addr + len <= vmm->vm_start))
2112+ if (task_size - len >= addr && check_heap_stack_gap(vmm, addr, len))
2113 return addr;
2114 }
2115- addr = TASK_UNMAPPED_BASE;
2116+ addr = current->mm->mmap_base;
2117 if (do_color_align)
2118 addr = COLOUR_ALIGN(addr, pgoff);
2119 else
2120@@ -122,7 +126,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
2121 /* At this point: (!vmm || addr < vmm->vm_end). */
2122 if (task_size - len < addr)
2123 return -ENOMEM;
2124- if (!vmm || addr + len <= vmm->vm_start)
2125+ if (check_heap_stack_gap(vmm, addr, len))
2126 return addr;
2127 addr = vmm->vm_end;
2128 if (do_color_align)
2129diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
2130index e97a7a2..f18f5b0 100644
2131--- a/arch/mips/mm/fault.c
2132+++ b/arch/mips/mm/fault.c
2133@@ -26,6 +26,23 @@
2134 #include <asm/ptrace.h>
2135 #include <asm/highmem.h> /* For VMALLOC_END */
2136
2137+#ifdef CONFIG_PAX_PAGEEXEC
2138+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2139+{
2140+ unsigned long i;
2141+
2142+ printk(KERN_ERR "PAX: bytes at PC: ");
2143+ for (i = 0; i < 5; i++) {
2144+ unsigned int c;
2145+ if (get_user(c, (unsigned int *)pc+i))
2146+ printk(KERN_CONT "???????? ");
2147+ else
2148+ printk(KERN_CONT "%08x ", c);
2149+ }
2150+ printk("\n");
2151+}
2152+#endif
2153+
2154 /*
2155 * This routine handles page faults. It determines the address,
2156 * and the problem, and then passes it off to one of the appropriate
2157diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
2158index 9c802eb..0592e41 100644
2159--- a/arch/parisc/include/asm/elf.h
2160+++ b/arch/parisc/include/asm/elf.h
2161@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration... */
2162
2163 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
2164
2165+#ifdef CONFIG_PAX_ASLR
2166+#define PAX_ELF_ET_DYN_BASE 0x10000UL
2167+
2168+#define PAX_DELTA_MMAP_LEN 16
2169+#define PAX_DELTA_STACK_LEN 16
2170+#endif
2171+
2172 /* This yields a mask that user programs can use to figure out what
2173 instruction set this CPU supports. This could be done in user space,
2174 but it's not easy, and we've already done it here. */
2175diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
2176index a27d2e2..18fd845 100644
2177--- a/arch/parisc/include/asm/pgtable.h
2178+++ b/arch/parisc/include/asm/pgtable.h
2179@@ -207,6 +207,17 @@
2180 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
2181 #define PAGE_COPY PAGE_EXECREAD
2182 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
2183+
2184+#ifdef CONFIG_PAX_PAGEEXEC
2185+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
2186+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
2187+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
2188+#else
2189+# define PAGE_SHARED_NOEXEC PAGE_SHARED
2190+# define PAGE_COPY_NOEXEC PAGE_COPY
2191+# define PAGE_READONLY_NOEXEC PAGE_READONLY
2192+#endif
2193+
2194 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
2195 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
2196 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
2197diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
2198index 2120746..8d70a5e 100644
2199--- a/arch/parisc/kernel/module.c
2200+++ b/arch/parisc/kernel/module.c
2201@@ -95,16 +95,38 @@
2202
2203 /* three functions to determine where in the module core
2204 * or init pieces the location is */
2205+static inline int in_init_rx(struct module *me, void *loc)
2206+{
2207+ return (loc >= me->module_init_rx &&
2208+ loc < (me->module_init_rx + me->init_size_rx));
2209+}
2210+
2211+static inline int in_init_rw(struct module *me, void *loc)
2212+{
2213+ return (loc >= me->module_init_rw &&
2214+ loc < (me->module_init_rw + me->init_size_rw));
2215+}
2216+
2217 static inline int in_init(struct module *me, void *loc)
2218 {
2219- return (loc >= me->module_init &&
2220- loc <= (me->module_init + me->init_size));
2221+ return in_init_rx(me, loc) || in_init_rw(me, loc);
2222+}
2223+
2224+static inline int in_core_rx(struct module *me, void *loc)
2225+{
2226+ return (loc >= me->module_core_rx &&
2227+ loc < (me->module_core_rx + me->core_size_rx));
2228+}
2229+
2230+static inline int in_core_rw(struct module *me, void *loc)
2231+{
2232+ return (loc >= me->module_core_rw &&
2233+ loc < (me->module_core_rw + me->core_size_rw));
2234 }
2235
2236 static inline int in_core(struct module *me, void *loc)
2237 {
2238- return (loc >= me->module_core &&
2239- loc <= (me->module_core + me->core_size));
2240+ return in_core_rx(me, loc) || in_core_rw(me, loc);
2241 }
2242
2243 static inline int in_local(struct module *me, void *loc)
2244@@ -364,13 +386,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
2245 }
2246
2247 /* align things a bit */
2248- me->core_size = ALIGN(me->core_size, 16);
2249- me->arch.got_offset = me->core_size;
2250- me->core_size += gots * sizeof(struct got_entry);
2251+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
2252+ me->arch.got_offset = me->core_size_rw;
2253+ me->core_size_rw += gots * sizeof(struct got_entry);
2254
2255- me->core_size = ALIGN(me->core_size, 16);
2256- me->arch.fdesc_offset = me->core_size;
2257- me->core_size += fdescs * sizeof(Elf_Fdesc);
2258+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
2259+ me->arch.fdesc_offset = me->core_size_rw;
2260+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
2261
2262 me->arch.got_max = gots;
2263 me->arch.fdesc_max = fdescs;
2264@@ -388,7 +410,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
2265
2266 BUG_ON(value == 0);
2267
2268- got = me->module_core + me->arch.got_offset;
2269+ got = me->module_core_rw + me->arch.got_offset;
2270 for (i = 0; got[i].addr; i++)
2271 if (got[i].addr == value)
2272 goto out;
2273@@ -406,7 +428,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
2274 #ifdef CONFIG_64BIT
2275 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
2276 {
2277- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
2278+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
2279
2280 if (!value) {
2281 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
2282@@ -424,7 +446,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
2283
2284 /* Create new one */
2285 fdesc->addr = value;
2286- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
2287+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
2288 return (Elf_Addr)fdesc;
2289 }
2290 #endif /* CONFIG_64BIT */
2291@@ -848,7 +870,7 @@ register_unwind_table(struct module *me,
2292
2293 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
2294 end = table + sechdrs[me->arch.unwind_section].sh_size;
2295- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
2296+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
2297
2298 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
2299 me->arch.unwind_section, table, end, gp);
2300diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
2301index 9147391..f3d949a 100644
2302--- a/arch/parisc/kernel/sys_parisc.c
2303+++ b/arch/parisc/kernel/sys_parisc.c
2304@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
2305 /* At this point: (!vma || addr < vma->vm_end). */
2306 if (TASK_SIZE - len < addr)
2307 return -ENOMEM;
2308- if (!vma || addr + len <= vma->vm_start)
2309+ if (check_heap_stack_gap(vma, addr, len))
2310 return addr;
2311 addr = vma->vm_end;
2312 }
2313@@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
2314 /* At this point: (!vma || addr < vma->vm_end). */
2315 if (TASK_SIZE - len < addr)
2316 return -ENOMEM;
2317- if (!vma || addr + len <= vma->vm_start)
2318+ if (check_heap_stack_gap(vma, addr, len))
2319 return addr;
2320 addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
2321 if (addr < vma->vm_end) /* handle wraparound */
2322@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
2323 if (flags & MAP_FIXED)
2324 return addr;
2325 if (!addr)
2326- addr = TASK_UNMAPPED_BASE;
2327+ addr = current->mm->mmap_base;
2328
2329 if (filp) {
2330 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
2331diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
2332index 8b58bf0..7afff03 100644
2333--- a/arch/parisc/kernel/traps.c
2334+++ b/arch/parisc/kernel/traps.c
2335@@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
2336
2337 down_read(&current->mm->mmap_sem);
2338 vma = find_vma(current->mm,regs->iaoq[0]);
2339- if (vma && (regs->iaoq[0] >= vma->vm_start)
2340- && (vma->vm_flags & VM_EXEC)) {
2341-
2342+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
2343 fault_address = regs->iaoq[0];
2344 fault_space = regs->iasq[0];
2345
2346diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
2347index c6afbfc..c5839f6 100644
2348--- a/arch/parisc/mm/fault.c
2349+++ b/arch/parisc/mm/fault.c
2350@@ -15,6 +15,7 @@
2351 #include <linux/sched.h>
2352 #include <linux/interrupt.h>
2353 #include <linux/module.h>
2354+#include <linux/unistd.h>
2355
2356 #include <asm/uaccess.h>
2357 #include <asm/traps.h>
2358@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
2359 static unsigned long
2360 parisc_acctyp(unsigned long code, unsigned int inst)
2361 {
2362- if (code == 6 || code == 16)
2363+ if (code == 6 || code == 7 || code == 16)
2364 return VM_EXEC;
2365
2366 switch (inst & 0xf0000000) {
2367@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
2368 }
2369 #endif
2370
2371+#ifdef CONFIG_PAX_PAGEEXEC
2372+/*
2373+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
2374+ *
2375+ * returns 1 when task should be killed
2376+ * 2 when rt_sigreturn trampoline was detected
2377+ * 3 when unpatched PLT trampoline was detected
2378+ */
2379+static int pax_handle_fetch_fault(struct pt_regs *regs)
2380+{
2381+
2382+#ifdef CONFIG_PAX_EMUPLT
2383+ int err;
2384+
2385+ do { /* PaX: unpatched PLT emulation */
2386+ unsigned int bl, depwi;
2387+
2388+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
2389+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
2390+
2391+ if (err)
2392+ break;
2393+
2394+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
2395+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
2396+
2397+ err = get_user(ldw, (unsigned int *)addr);
2398+ err |= get_user(bv, (unsigned int *)(addr+4));
2399+ err |= get_user(ldw2, (unsigned int *)(addr+8));
2400+
2401+ if (err)
2402+ break;
2403+
2404+ if (ldw == 0x0E801096U &&
2405+ bv == 0xEAC0C000U &&
2406+ ldw2 == 0x0E881095U)
2407+ {
2408+ unsigned int resolver, map;
2409+
2410+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
2411+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
2412+ if (err)
2413+ break;
2414+
2415+ regs->gr[20] = instruction_pointer(regs)+8;
2416+ regs->gr[21] = map;
2417+ regs->gr[22] = resolver;
2418+ regs->iaoq[0] = resolver | 3UL;
2419+ regs->iaoq[1] = regs->iaoq[0] + 4;
2420+ return 3;
2421+ }
2422+ }
2423+ } while (0);
2424+#endif
2425+
2426+#ifdef CONFIG_PAX_EMUTRAMP
2427+
2428+#ifndef CONFIG_PAX_EMUSIGRT
2429+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
2430+ return 1;
2431+#endif
2432+
2433+ do { /* PaX: rt_sigreturn emulation */
2434+ unsigned int ldi1, ldi2, bel, nop;
2435+
2436+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
2437+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
2438+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
2439+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
2440+
2441+ if (err)
2442+ break;
2443+
2444+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
2445+ ldi2 == 0x3414015AU &&
2446+ bel == 0xE4008200U &&
2447+ nop == 0x08000240U)
2448+ {
2449+ regs->gr[25] = (ldi1 & 2) >> 1;
2450+ regs->gr[20] = __NR_rt_sigreturn;
2451+ regs->gr[31] = regs->iaoq[1] + 16;
2452+ regs->sr[0] = regs->iasq[1];
2453+ regs->iaoq[0] = 0x100UL;
2454+ regs->iaoq[1] = regs->iaoq[0] + 4;
2455+ regs->iasq[0] = regs->sr[2];
2456+ regs->iasq[1] = regs->sr[2];
2457+ return 2;
2458+ }
2459+ } while (0);
2460+#endif
2461+
2462+ return 1;
2463+}
2464+
2465+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2466+{
2467+ unsigned long i;
2468+
2469+ printk(KERN_ERR "PAX: bytes at PC: ");
2470+ for (i = 0; i < 5; i++) {
2471+ unsigned int c;
2472+ if (get_user(c, (unsigned int *)pc+i))
2473+ printk(KERN_CONT "???????? ");
2474+ else
2475+ printk(KERN_CONT "%08x ", c);
2476+ }
2477+ printk("\n");
2478+}
2479+#endif
2480+
2481 int fixup_exception(struct pt_regs *regs)
2482 {
2483 const struct exception_table_entry *fix;
2484@@ -192,8 +303,33 @@ good_area:
2485
2486 acc_type = parisc_acctyp(code,regs->iir);
2487
2488- if ((vma->vm_flags & acc_type) != acc_type)
2489+ if ((vma->vm_flags & acc_type) != acc_type) {
2490+
2491+#ifdef CONFIG_PAX_PAGEEXEC
2492+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
2493+ (address & ~3UL) == instruction_pointer(regs))
2494+ {
2495+ up_read(&mm->mmap_sem);
2496+ switch (pax_handle_fetch_fault(regs)) {
2497+
2498+#ifdef CONFIG_PAX_EMUPLT
2499+ case 3:
2500+ return;
2501+#endif
2502+
2503+#ifdef CONFIG_PAX_EMUTRAMP
2504+ case 2:
2505+ return;
2506+#endif
2507+
2508+ }
2509+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
2510+ do_group_exit(SIGKILL);
2511+ }
2512+#endif
2513+
2514 goto bad_area;
2515+ }
2516
2517 /*
2518 * If for any reason at all we couldn't handle the fault, make
2519diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
2520index c107b74..409dc0f 100644
2521--- a/arch/powerpc/Makefile
2522+++ b/arch/powerpc/Makefile
2523@@ -74,6 +74,8 @@ KBUILD_AFLAGS += -Iarch/$(ARCH)
2524 KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
2525 CPP = $(CC) -E $(KBUILD_CFLAGS)
2526
2527+cflags-y += -Wno-sign-compare -Wno-extra
2528+
2529 CHECKFLAGS += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
2530
2531 ifeq ($(CONFIG_PPC64),y)
2532diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h
2533index 6d94d27..50d4cad 100644
2534--- a/arch/powerpc/include/asm/device.h
2535+++ b/arch/powerpc/include/asm/device.h
2536@@ -14,7 +14,7 @@ struct dev_archdata {
2537 struct device_node *of_node;
2538
2539 /* DMA operations on that device */
2540- struct dma_map_ops *dma_ops;
2541+ const struct dma_map_ops *dma_ops;
2542
2543 /*
2544 * When an iommu is in use, dma_data is used as a ptr to the base of the
2545diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
2546index e281dae..2b8a784 100644
2547--- a/arch/powerpc/include/asm/dma-mapping.h
2548+++ b/arch/powerpc/include/asm/dma-mapping.h
2549@@ -69,9 +69,9 @@ static inline unsigned long device_to_mask(struct device *dev)
2550 #ifdef CONFIG_PPC64
2551 extern struct dma_map_ops dma_iommu_ops;
2552 #endif
2553-extern struct dma_map_ops dma_direct_ops;
2554+extern const struct dma_map_ops dma_direct_ops;
2555
2556-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
2557+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
2558 {
2559 /* We don't handle the NULL dev case for ISA for now. We could
2560 * do it via an out of line call but it is not needed for now. The
2561@@ -84,7 +84,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
2562 return dev->archdata.dma_ops;
2563 }
2564
2565-static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
2566+static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
2567 {
2568 dev->archdata.dma_ops = ops;
2569 }
2570@@ -118,7 +118,7 @@ static inline void set_dma_offset(struct device *dev, dma_addr_t off)
2571
2572 static inline int dma_supported(struct device *dev, u64 mask)
2573 {
2574- struct dma_map_ops *dma_ops = get_dma_ops(dev);
2575+ const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2576
2577 if (unlikely(dma_ops == NULL))
2578 return 0;
2579@@ -132,7 +132,7 @@ static inline int dma_supported(struct device *dev, u64 mask)
2580
2581 static inline int dma_set_mask(struct device *dev, u64 dma_mask)
2582 {
2583- struct dma_map_ops *dma_ops = get_dma_ops(dev);
2584+ const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2585
2586 if (unlikely(dma_ops == NULL))
2587 return -EIO;
2588@@ -147,7 +147,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
2589 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
2590 dma_addr_t *dma_handle, gfp_t flag)
2591 {
2592- struct dma_map_ops *dma_ops = get_dma_ops(dev);
2593+ const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2594 void *cpu_addr;
2595
2596 BUG_ON(!dma_ops);
2597@@ -162,7 +162,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
2598 static inline void dma_free_coherent(struct device *dev, size_t size,
2599 void *cpu_addr, dma_addr_t dma_handle)
2600 {
2601- struct dma_map_ops *dma_ops = get_dma_ops(dev);
2602+ const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2603
2604 BUG_ON(!dma_ops);
2605
2606@@ -173,7 +173,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
2607
2608 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
2609 {
2610- struct dma_map_ops *dma_ops = get_dma_ops(dev);
2611+ const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2612
2613 if (dma_ops->mapping_error)
2614 return dma_ops->mapping_error(dev, dma_addr);
2615diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
2616index 5698502..5db093c 100644
2617--- a/arch/powerpc/include/asm/elf.h
2618+++ b/arch/powerpc/include/asm/elf.h
2619@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
2620 the loader. We need to make sure that it is out of the way of the program
2621 that it will "exec", and that there is sufficient room for the brk. */
2622
2623-extern unsigned long randomize_et_dyn(unsigned long base);
2624-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
2625+#define ELF_ET_DYN_BASE (0x20000000)
2626+
2627+#ifdef CONFIG_PAX_ASLR
2628+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
2629+
2630+#ifdef __powerpc64__
2631+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 16 : 28)
2632+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 16 : 28)
2633+#else
2634+#define PAX_DELTA_MMAP_LEN 15
2635+#define PAX_DELTA_STACK_LEN 15
2636+#endif
2637+#endif
2638
2639 /*
2640 * Our registers are always unsigned longs, whether we're a 32 bit
2641@@ -275,9 +286,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
2642 (0x7ff >> (PAGE_SHIFT - 12)) : \
2643 (0x3ffff >> (PAGE_SHIFT - 12)))
2644
2645-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2646-#define arch_randomize_brk arch_randomize_brk
2647-
2648 #endif /* __KERNEL__ */
2649
2650 /*
2651diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h
2652index edfc980..1766f59 100644
2653--- a/arch/powerpc/include/asm/iommu.h
2654+++ b/arch/powerpc/include/asm/iommu.h
2655@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(void);
2656 extern void iommu_init_early_dart(void);
2657 extern void iommu_init_early_pasemi(void);
2658
2659+/* dma-iommu.c */
2660+extern int dma_iommu_dma_supported(struct device *dev, u64 mask);
2661+
2662 #ifdef CONFIG_PCI
2663 extern void pci_iommu_init(void);
2664 extern void pci_direct_iommu_init(void);
2665diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
2666index 9163695..5a00112 100644
2667--- a/arch/powerpc/include/asm/kmap_types.h
2668+++ b/arch/powerpc/include/asm/kmap_types.h
2669@@ -26,6 +26,7 @@ enum km_type {
2670 KM_SOFTIRQ1,
2671 KM_PPC_SYNC_PAGE,
2672 KM_PPC_SYNC_ICACHE,
2673+ KM_CLEARPAGE,
2674 KM_TYPE_NR
2675 };
2676
2677diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
2678index ff24254..fe45b21 100644
2679--- a/arch/powerpc/include/asm/page.h
2680+++ b/arch/powerpc/include/asm/page.h
2681@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
2682 * and needs to be executable. This means the whole heap ends
2683 * up being executable.
2684 */
2685-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
2686- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2687+#define VM_DATA_DEFAULT_FLAGS32 \
2688+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
2689+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2690
2691 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
2692 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2693@@ -145,6 +146,9 @@ extern phys_addr_t kernstart_addr;
2694 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
2695 #endif
2696
2697+#define ktla_ktva(addr) (addr)
2698+#define ktva_ktla(addr) (addr)
2699+
2700 #ifndef __ASSEMBLY__
2701
2702 #undef STRICT_MM_TYPECHECKS
2703diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
2704index 3f17b83..1f9e766 100644
2705--- a/arch/powerpc/include/asm/page_64.h
2706+++ b/arch/powerpc/include/asm/page_64.h
2707@@ -180,15 +180,18 @@ do { \
2708 * stack by default, so in the absense of a PT_GNU_STACK program header
2709 * we turn execute permission off.
2710 */
2711-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
2712- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2713+#define VM_STACK_DEFAULT_FLAGS32 \
2714+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
2715+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2716
2717 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
2718 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2719
2720+#ifndef CONFIG_PAX_PAGEEXEC
2721 #define VM_STACK_DEFAULT_FLAGS \
2722 (test_thread_flag(TIF_32BIT) ? \
2723 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
2724+#endif
2725
2726 #include <asm-generic/getorder.h>
2727
2728diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
2729index b5ea626..4030822 100644
2730--- a/arch/powerpc/include/asm/pci.h
2731+++ b/arch/powerpc/include/asm/pci.h
2732@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
2733 }
2734
2735 #ifdef CONFIG_PCI
2736-extern void set_pci_dma_ops(struct dma_map_ops *dma_ops);
2737-extern struct dma_map_ops *get_pci_dma_ops(void);
2738+extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops);
2739+extern const struct dma_map_ops *get_pci_dma_ops(void);
2740 #else /* CONFIG_PCI */
2741 #define set_pci_dma_ops(d)
2742 #define get_pci_dma_ops() NULL
2743diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
2744index 2a5da06..d65bea2 100644
2745--- a/arch/powerpc/include/asm/pgtable.h
2746+++ b/arch/powerpc/include/asm/pgtable.h
2747@@ -2,6 +2,7 @@
2748 #define _ASM_POWERPC_PGTABLE_H
2749 #ifdef __KERNEL__
2750
2751+#include <linux/const.h>
2752 #ifndef __ASSEMBLY__
2753 #include <asm/processor.h> /* For TASK_SIZE */
2754 #include <asm/mmu.h>
2755diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
2756index 4aad413..85d86bf 100644
2757--- a/arch/powerpc/include/asm/pte-hash32.h
2758+++ b/arch/powerpc/include/asm/pte-hash32.h
2759@@ -21,6 +21,7 @@
2760 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
2761 #define _PAGE_USER 0x004 /* usermode access allowed */
2762 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
2763+#define _PAGE_EXEC _PAGE_GUARDED
2764 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
2765 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
2766 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
2767diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
2768index 8c34149..78f425a 100644
2769--- a/arch/powerpc/include/asm/ptrace.h
2770+++ b/arch/powerpc/include/asm/ptrace.h
2771@@ -103,7 +103,7 @@ extern unsigned long profile_pc(struct pt_regs *regs);
2772 } while(0)
2773
2774 struct task_struct;
2775-extern unsigned long ptrace_get_reg(struct task_struct *task, int regno);
2776+extern unsigned long ptrace_get_reg(struct task_struct *task, unsigned int regno);
2777 extern int ptrace_put_reg(struct task_struct *task, int regno,
2778 unsigned long data);
2779
2780diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
2781index 32a7c30..be3a8bb 100644
2782--- a/arch/powerpc/include/asm/reg.h
2783+++ b/arch/powerpc/include/asm/reg.h
2784@@ -191,6 +191,7 @@
2785 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
2786 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
2787 #define DSISR_NOHPTE 0x40000000 /* no translation found */
2788+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
2789 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
2790 #define DSISR_ISSTORE 0x02000000 /* access was a store */
2791 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
2792diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h
2793index 8979d4c..d2fd0d3 100644
2794--- a/arch/powerpc/include/asm/swiotlb.h
2795+++ b/arch/powerpc/include/asm/swiotlb.h
2796@@ -13,7 +13,7 @@
2797
2798 #include <linux/swiotlb.h>
2799
2800-extern struct dma_map_ops swiotlb_dma_ops;
2801+extern const struct dma_map_ops swiotlb_dma_ops;
2802
2803 static inline void dma_mark_clean(void *addr, size_t size) {}
2804
2805diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
2806index 094a12a..877a60a 100644
2807--- a/arch/powerpc/include/asm/system.h
2808+++ b/arch/powerpc/include/asm/system.h
2809@@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
2810 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
2811 #endif
2812
2813-extern unsigned long arch_align_stack(unsigned long sp);
2814+#define arch_align_stack(x) ((x) & ~0xfUL)
2815
2816 /* Used in very early kernel initialization. */
2817 extern unsigned long reloc_offset(void);
2818diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
2819index bd0fb84..a42a14b 100644
2820--- a/arch/powerpc/include/asm/uaccess.h
2821+++ b/arch/powerpc/include/asm/uaccess.h
2822@@ -13,6 +13,8 @@
2823 #define VERIFY_READ 0
2824 #define VERIFY_WRITE 1
2825
2826+extern void check_object_size(const void *ptr, unsigned long n, bool to);
2827+
2828 /*
2829 * The fs value determines whether argument validity checking should be
2830 * performed or not. If get_fs() == USER_DS, checking is performed, with
2831@@ -327,52 +329,6 @@ do { \
2832 extern unsigned long __copy_tofrom_user(void __user *to,
2833 const void __user *from, unsigned long size);
2834
2835-#ifndef __powerpc64__
2836-
2837-static inline unsigned long copy_from_user(void *to,
2838- const void __user *from, unsigned long n)
2839-{
2840- unsigned long over;
2841-
2842- if (access_ok(VERIFY_READ, from, n))
2843- return __copy_tofrom_user((__force void __user *)to, from, n);
2844- if ((unsigned long)from < TASK_SIZE) {
2845- over = (unsigned long)from + n - TASK_SIZE;
2846- return __copy_tofrom_user((__force void __user *)to, from,
2847- n - over) + over;
2848- }
2849- return n;
2850-}
2851-
2852-static inline unsigned long copy_to_user(void __user *to,
2853- const void *from, unsigned long n)
2854-{
2855- unsigned long over;
2856-
2857- if (access_ok(VERIFY_WRITE, to, n))
2858- return __copy_tofrom_user(to, (__force void __user *)from, n);
2859- if ((unsigned long)to < TASK_SIZE) {
2860- over = (unsigned long)to + n - TASK_SIZE;
2861- return __copy_tofrom_user(to, (__force void __user *)from,
2862- n - over) + over;
2863- }
2864- return n;
2865-}
2866-
2867-#else /* __powerpc64__ */
2868-
2869-#define __copy_in_user(to, from, size) \
2870- __copy_tofrom_user((to), (from), (size))
2871-
2872-extern unsigned long copy_from_user(void *to, const void __user *from,
2873- unsigned long n);
2874-extern unsigned long copy_to_user(void __user *to, const void *from,
2875- unsigned long n);
2876-extern unsigned long copy_in_user(void __user *to, const void __user *from,
2877- unsigned long n);
2878-
2879-#endif /* __powerpc64__ */
2880-
2881 static inline unsigned long __copy_from_user_inatomic(void *to,
2882 const void __user *from, unsigned long n)
2883 {
2884@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
2885 if (ret == 0)
2886 return 0;
2887 }
2888+
2889+ if (!__builtin_constant_p(n))
2890+ check_object_size(to, n, false);
2891+
2892 return __copy_tofrom_user((__force void __user *)to, from, n);
2893 }
2894
2895@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
2896 if (ret == 0)
2897 return 0;
2898 }
2899+
2900+ if (!__builtin_constant_p(n))
2901+ check_object_size(from, n, true);
2902+
2903 return __copy_tofrom_user(to, (__force const void __user *)from, n);
2904 }
2905
2906@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_user(void __user *to,
2907 return __copy_to_user_inatomic(to, from, size);
2908 }
2909
2910+#ifndef __powerpc64__
2911+
2912+static inline unsigned long __must_check copy_from_user(void *to,
2913+ const void __user *from, unsigned long n)
2914+{
2915+ unsigned long over;
2916+
2917+ if ((long)n < 0)
2918+ return n;
2919+
2920+ if (access_ok(VERIFY_READ, from, n)) {
2921+ if (!__builtin_constant_p(n))
2922+ check_object_size(to, n, false);
2923+ return __copy_tofrom_user((__force void __user *)to, from, n);
2924+ }
2925+ if ((unsigned long)from < TASK_SIZE) {
2926+ over = (unsigned long)from + n - TASK_SIZE;
2927+ if (!__builtin_constant_p(n - over))
2928+ check_object_size(to, n - over, false);
2929+ return __copy_tofrom_user((__force void __user *)to, from,
2930+ n - over) + over;
2931+ }
2932+ return n;
2933+}
2934+
2935+static inline unsigned long __must_check copy_to_user(void __user *to,
2936+ const void *from, unsigned long n)
2937+{
2938+ unsigned long over;
2939+
2940+ if ((long)n < 0)
2941+ return n;
2942+
2943+ if (access_ok(VERIFY_WRITE, to, n)) {
2944+ if (!__builtin_constant_p(n))
2945+ check_object_size(from, n, true);
2946+ return __copy_tofrom_user(to, (__force void __user *)from, n);
2947+ }
2948+ if ((unsigned long)to < TASK_SIZE) {
2949+ over = (unsigned long)to + n - TASK_SIZE;
2950+ if (!__builtin_constant_p(n))
2951+ check_object_size(from, n - over, true);
2952+ return __copy_tofrom_user(to, (__force void __user *)from,
2953+ n - over) + over;
2954+ }
2955+ return n;
2956+}
2957+
2958+#else /* __powerpc64__ */
2959+
2960+#define __copy_in_user(to, from, size) \
2961+ __copy_tofrom_user((to), (from), (size))
2962+
2963+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2964+{
2965+ if ((long)n < 0 || n > INT_MAX)
2966+ return n;
2967+
2968+ if (!__builtin_constant_p(n))
2969+ check_object_size(to, n, false);
2970+
2971+ if (likely(access_ok(VERIFY_READ, from, n)))
2972+ n = __copy_from_user(to, from, n);
2973+ else
2974+ memset(to, 0, n);
2975+ return n;
2976+}
2977+
2978+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2979+{
2980+ if ((long)n < 0 || n > INT_MAX)
2981+ return n;
2982+
2983+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
2984+ if (!__builtin_constant_p(n))
2985+ check_object_size(from, n, true);
2986+ n = __copy_to_user(to, from, n);
2987+ }
2988+ return n;
2989+}
2990+
2991+extern unsigned long copy_in_user(void __user *to, const void __user *from,
2992+ unsigned long n);
2993+
2994+#endif /* __powerpc64__ */
2995+
2996 extern unsigned long __clear_user(void __user *addr, unsigned long size);
2997
2998 static inline unsigned long clear_user(void __user *addr, unsigned long size)
2999diff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c
3000index bb37b1d..01fe9ce 100644
3001--- a/arch/powerpc/kernel/cacheinfo.c
3002+++ b/arch/powerpc/kernel/cacheinfo.c
3003@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_index_opt_attrs[] = {
3004 &cache_assoc_attr,
3005 };
3006
3007-static struct sysfs_ops cache_index_ops = {
3008+static const struct sysfs_ops cache_index_ops = {
3009 .show = cache_index_show,
3010 };
3011
3012diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c
3013index 37771a5..648530c 100644
3014--- a/arch/powerpc/kernel/dma-iommu.c
3015+++ b/arch/powerpc/kernel/dma-iommu.c
3016@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist,
3017 }
3018
3019 /* We support DMA to/from any memory page via the iommu */
3020-static int dma_iommu_dma_supported(struct device *dev, u64 mask)
3021+int dma_iommu_dma_supported(struct device *dev, u64 mask)
3022 {
3023 struct iommu_table *tbl = get_iommu_table_base(dev);
3024
3025diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
3026index e96cbbd..bdd6d41 100644
3027--- a/arch/powerpc/kernel/dma-swiotlb.c
3028+++ b/arch/powerpc/kernel/dma-swiotlb.c
3029@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
3030 * map_page, and unmap_page on highmem, use normal dma_ops
3031 * for everything else.
3032 */
3033-struct dma_map_ops swiotlb_dma_ops = {
3034+const struct dma_map_ops swiotlb_dma_ops = {
3035 .alloc_coherent = dma_direct_alloc_coherent,
3036 .free_coherent = dma_direct_free_coherent,
3037 .map_sg = swiotlb_map_sg_attrs,
3038diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
3039index 6215062..ebea59c 100644
3040--- a/arch/powerpc/kernel/dma.c
3041+++ b/arch/powerpc/kernel/dma.c
3042@@ -134,7 +134,7 @@ static inline void dma_direct_sync_single_range(struct device *dev,
3043 }
3044 #endif
3045
3046-struct dma_map_ops dma_direct_ops = {
3047+const struct dma_map_ops dma_direct_ops = {
3048 .alloc_coherent = dma_direct_alloc_coherent,
3049 .free_coherent = dma_direct_free_coherent,
3050 .map_sg = dma_direct_map_sg,
3051diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
3052index 24dcc0e..a300455 100644
3053--- a/arch/powerpc/kernel/exceptions-64e.S
3054+++ b/arch/powerpc/kernel/exceptions-64e.S
3055@@ -455,6 +455,7 @@ storage_fault_common:
3056 std r14,_DAR(r1)
3057 std r15,_DSISR(r1)
3058 addi r3,r1,STACK_FRAME_OVERHEAD
3059+ bl .save_nvgprs
3060 mr r4,r14
3061 mr r5,r15
3062 ld r14,PACA_EXGEN+EX_R14(r13)
3063@@ -464,8 +465,7 @@ storage_fault_common:
3064 cmpdi r3,0
3065 bne- 1f
3066 b .ret_from_except_lite
3067-1: bl .save_nvgprs
3068- mr r5,r3
3069+1: mr r5,r3
3070 addi r3,r1,STACK_FRAME_OVERHEAD
3071 ld r4,_DAR(r1)
3072 bl .bad_page_fault
3073diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
3074index 1808876..9fd206a 100644
3075--- a/arch/powerpc/kernel/exceptions-64s.S
3076+++ b/arch/powerpc/kernel/exceptions-64s.S
3077@@ -818,10 +818,10 @@ handle_page_fault:
3078 11: ld r4,_DAR(r1)
3079 ld r5,_DSISR(r1)
3080 addi r3,r1,STACK_FRAME_OVERHEAD
3081+ bl .save_nvgprs
3082 bl .do_page_fault
3083 cmpdi r3,0
3084 beq+ 13f
3085- bl .save_nvgprs
3086 mr r5,r3
3087 addi r3,r1,STACK_FRAME_OVERHEAD
3088 lwz r4,_DAR(r1)
3089diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
3090index a4c8b38..1b09ad9 100644
3091--- a/arch/powerpc/kernel/ibmebus.c
3092+++ b/arch/powerpc/kernel/ibmebus.c
3093@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct device *dev, u64 mask)
3094 return 1;
3095 }
3096
3097-static struct dma_map_ops ibmebus_dma_ops = {
3098+static const struct dma_map_ops ibmebus_dma_ops = {
3099 .alloc_coherent = ibmebus_alloc_coherent,
3100 .free_coherent = ibmebus_free_coherent,
3101 .map_sg = ibmebus_map_sg,
3102diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
3103index 641c74b..8339ad7 100644
3104--- a/arch/powerpc/kernel/kgdb.c
3105+++ b/arch/powerpc/kernel/kgdb.c
3106@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)
3107 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
3108 return 0;
3109
3110- if (*(u32 *) (regs->nip) == *(u32 *) (&arch_kgdb_ops.gdb_bpt_instr))
3111+ if (*(u32 *) (regs->nip) == *(const u32 *) (&arch_kgdb_ops.gdb_bpt_instr))
3112 regs->nip += 4;
3113
3114 return 1;
3115@@ -353,7 +353,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
3116 /*
3117 * Global data
3118 */
3119-struct kgdb_arch arch_kgdb_ops = {
3120+const struct kgdb_arch arch_kgdb_ops = {
3121 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
3122 };
3123
3124diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c
3125index 477c663..4f50234 100644
3126--- a/arch/powerpc/kernel/module.c
3127+++ b/arch/powerpc/kernel/module.c
3128@@ -31,11 +31,24 @@
3129
3130 LIST_HEAD(module_bug_list);
3131
3132+#ifdef CONFIG_PAX_KERNEXEC
3133 void *module_alloc(unsigned long size)
3134 {
3135 if (size == 0)
3136 return NULL;
3137
3138+ return vmalloc(size);
3139+}
3140+
3141+void *module_alloc_exec(unsigned long size)
3142+#else
3143+void *module_alloc(unsigned long size)
3144+#endif
3145+
3146+{
3147+ if (size == 0)
3148+ return NULL;
3149+
3150 return vmalloc_exec(size);
3151 }
3152
3153@@ -45,6 +58,13 @@ void module_free(struct module *mod, void *module_region)
3154 vfree(module_region);
3155 }
3156
3157+#ifdef CONFIG_PAX_KERNEXEC
3158+void module_free_exec(struct module *mod, void *module_region)
3159+{
3160+ module_free(mod, module_region);
3161+}
3162+#endif
3163+
3164 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
3165 const Elf_Shdr *sechdrs,
3166 const char *name)
3167diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
3168index f832773..0507238 100644
3169--- a/arch/powerpc/kernel/module_32.c
3170+++ b/arch/powerpc/kernel/module_32.c
3171@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
3172 me->arch.core_plt_section = i;
3173 }
3174 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
3175- printk("Module doesn't contain .plt or .init.plt sections.\n");
3176+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
3177 return -ENOEXEC;
3178 }
3179
3180@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *location,
3181
3182 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
3183 /* Init, or core PLT? */
3184- if (location >= mod->module_core
3185- && location < mod->module_core + mod->core_size)
3186+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
3187+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
3188 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
3189- else
3190+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
3191+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
3192 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
3193+ else {
3194+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
3195+ return ~0UL;
3196+ }
3197
3198 /* Find this entry, or if that fails, the next avail. entry */
3199 while (entry->jump[0]) {
3200diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
3201index cadbed6..b9bbb00 100644
3202--- a/arch/powerpc/kernel/pci-common.c
3203+++ b/arch/powerpc/kernel/pci-common.c
3204@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
3205 unsigned int ppc_pci_flags = 0;
3206
3207
3208-static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
3209+static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
3210
3211-void set_pci_dma_ops(struct dma_map_ops *dma_ops)
3212+void set_pci_dma_ops(const struct dma_map_ops *dma_ops)
3213 {
3214 pci_dma_ops = dma_ops;
3215 }
3216
3217-struct dma_map_ops *get_pci_dma_ops(void)
3218+const struct dma_map_ops *get_pci_dma_ops(void)
3219 {
3220 return pci_dma_ops;
3221 }
3222diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
3223index 7b816da..8d5c277 100644
3224--- a/arch/powerpc/kernel/process.c
3225+++ b/arch/powerpc/kernel/process.c
3226@@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs)
3227 * Lookup NIP late so we have the best change of getting the
3228 * above info out without failing
3229 */
3230- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
3231- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
3232+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
3233+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
3234 #endif
3235 show_stack(current, (unsigned long *) regs->gpr[1]);
3236 if (!user_mode(regs))
3237@@ -1034,10 +1034,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3238 newsp = stack[0];
3239 ip = stack[STACK_FRAME_LR_SAVE];
3240 if (!firstframe || ip != lr) {
3241- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
3242+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
3243 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
3244 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
3245- printk(" (%pS)",
3246+ printk(" (%pA)",
3247 (void *)current->ret_stack[curr_frame].ret);
3248 curr_frame--;
3249 }
3250@@ -1057,7 +1057,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3251 struct pt_regs *regs = (struct pt_regs *)
3252 (sp + STACK_FRAME_OVERHEAD);
3253 lr = regs->link;
3254- printk("--- Exception: %lx at %pS\n LR = %pS\n",
3255+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
3256 regs->trap, (void *)regs->nip, (void *)lr);
3257 firstframe = 1;
3258 }
3259@@ -1134,58 +1134,3 @@ void thread_info_cache_init(void)
3260 }
3261
3262 #endif /* THREAD_SHIFT < PAGE_SHIFT */
3263-
3264-unsigned long arch_align_stack(unsigned long sp)
3265-{
3266- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
3267- sp -= get_random_int() & ~PAGE_MASK;
3268- return sp & ~0xf;
3269-}
3270-
3271-static inline unsigned long brk_rnd(void)
3272-{
3273- unsigned long rnd = 0;
3274-
3275- /* 8MB for 32bit, 1GB for 64bit */
3276- if (is_32bit_task())
3277- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
3278- else
3279- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
3280-
3281- return rnd << PAGE_SHIFT;
3282-}
3283-
3284-unsigned long arch_randomize_brk(struct mm_struct *mm)
3285-{
3286- unsigned long base = mm->brk;
3287- unsigned long ret;
3288-
3289-#ifdef CONFIG_PPC_STD_MMU_64
3290- /*
3291- * If we are using 1TB segments and we are allowed to randomise
3292- * the heap, we can put it above 1TB so it is backed by a 1TB
3293- * segment. Otherwise the heap will be in the bottom 1TB
3294- * which always uses 256MB segments and this may result in a
3295- * performance penalty.
3296- */
3297- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
3298- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
3299-#endif
3300-
3301- ret = PAGE_ALIGN(base + brk_rnd());
3302-
3303- if (ret < mm->brk)
3304- return mm->brk;
3305-
3306- return ret;
3307-}
3308-
3309-unsigned long randomize_et_dyn(unsigned long base)
3310-{
3311- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
3312-
3313- if (ret < base)
3314- return base;
3315-
3316- return ret;
3317-}
3318diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
3319index ef14988..856c4bc 100644
3320--- a/arch/powerpc/kernel/ptrace.c
3321+++ b/arch/powerpc/kernel/ptrace.c
3322@@ -86,7 +86,7 @@ static int set_user_trap(struct task_struct *task, unsigned long trap)
3323 /*
3324 * Get contents of register REGNO in task TASK.
3325 */
3326-unsigned long ptrace_get_reg(struct task_struct *task, int regno)
3327+unsigned long ptrace_get_reg(struct task_struct *task, unsigned int regno)
3328 {
3329 if (task->thread.regs == NULL)
3330 return -EIO;
3331@@ -894,7 +894,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
3332
3333 CHECK_FULL_REGS(child->thread.regs);
3334 if (index < PT_FPR0) {
3335- tmp = ptrace_get_reg(child, (int) index);
3336+ tmp = ptrace_get_reg(child, index);
3337 } else {
3338 flush_fp_to_thread(child);
3339 tmp = ((unsigned long *)child->thread.fpr)
3340diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
3341index d670429..2bc59b2 100644
3342--- a/arch/powerpc/kernel/signal_32.c
3343+++ b/arch/powerpc/kernel/signal_32.c
3344@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
3345 /* Save user registers on the stack */
3346 frame = &rt_sf->uc.uc_mcontext;
3347 addr = frame;
3348- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
3349+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3350 if (save_user_regs(regs, frame, 0, 1))
3351 goto badframe;
3352 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
3353diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
3354index 2fe6fc6..ada0d96 100644
3355--- a/arch/powerpc/kernel/signal_64.c
3356+++ b/arch/powerpc/kernel/signal_64.c
3357@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
3358 current->thread.fpscr.val = 0;
3359
3360 /* Set up to return from userspace. */
3361- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
3362+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3363 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
3364 } else {
3365 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
3366diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
3367index b97c2d6..dd01a6a 100644
3368--- a/arch/powerpc/kernel/sys_ppc32.c
3369+++ b/arch/powerpc/kernel/sys_ppc32.c
3370@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct __sysctl_args32 __user *args)
3371 if (oldlenp) {
3372 if (!error) {
3373 if (get_user(oldlen, oldlenp) ||
3374- put_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)))
3375+ put_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)) ||
3376+ copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused)))
3377 error = -EFAULT;
3378 }
3379- copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused));
3380 }
3381 return error;
3382 }
3383diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
3384index 6f0ae1a..e4b6a56 100644
3385--- a/arch/powerpc/kernel/traps.c
3386+++ b/arch/powerpc/kernel/traps.c
3387@@ -99,6 +99,8 @@ static void pmac_backlight_unblank(void)
3388 static inline void pmac_backlight_unblank(void) { }
3389 #endif
3390
3391+extern void gr_handle_kernel_exploit(void);
3392+
3393 int die(const char *str, struct pt_regs *regs, long err)
3394 {
3395 static struct {
3396@@ -168,6 +170,8 @@ int die(const char *str, struct pt_regs *regs, long err)
3397 if (panic_on_oops)
3398 panic("Fatal exception");
3399
3400+ gr_handle_kernel_exploit();
3401+
3402 oops_exit();
3403 do_exit(err);
3404
3405diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
3406index 137dc22..fe57a79 100644
3407--- a/arch/powerpc/kernel/vdso.c
3408+++ b/arch/powerpc/kernel/vdso.c
3409@@ -36,6 +36,7 @@
3410 #include <asm/firmware.h>
3411 #include <asm/vdso.h>
3412 #include <asm/vdso_datapage.h>
3413+#include <asm/mman.h>
3414
3415 #include "setup.h"
3416
3417@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3418 vdso_base = VDSO32_MBASE;
3419 #endif
3420
3421- current->mm->context.vdso_base = 0;
3422+ current->mm->context.vdso_base = ~0UL;
3423
3424 /* vDSO has a problem and was disabled, just don't "enable" it for the
3425 * process
3426@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3427 vdso_base = get_unmapped_area(NULL, vdso_base,
3428 (vdso_pages << PAGE_SHIFT) +
3429 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
3430- 0, 0);
3431+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
3432 if (IS_ERR_VALUE(vdso_base)) {
3433 rc = vdso_base;
3434 goto fail_mmapsem;
3435diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
3436index 77f6421..829564a 100644
3437--- a/arch/powerpc/kernel/vio.c
3438+++ b/arch/powerpc/kernel/vio.c
3439@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struct device *dev,
3440 vio_cmo_dealloc(viodev, alloc_size);
3441 }
3442
3443-struct dma_map_ops vio_dma_mapping_ops = {
3444+static const struct dma_map_ops vio_dma_mapping_ops = {
3445 .alloc_coherent = vio_dma_iommu_alloc_coherent,
3446 .free_coherent = vio_dma_iommu_free_coherent,
3447 .map_sg = vio_dma_iommu_map_sg,
3448 .unmap_sg = vio_dma_iommu_unmap_sg,
3449+ .dma_supported = dma_iommu_dma_supported,
3450 .map_page = vio_dma_iommu_map_page,
3451 .unmap_page = vio_dma_iommu_unmap_page,
3452
3453@@ -857,7 +858,6 @@ static void vio_cmo_bus_remove(struct vio_dev *viodev)
3454
3455 static void vio_cmo_set_dma_ops(struct vio_dev *viodev)
3456 {
3457- vio_dma_mapping_ops.dma_supported = dma_iommu_ops.dma_supported;
3458 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
3459 }
3460
3461diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
3462index 5eea6f3..5d10396 100644
3463--- a/arch/powerpc/lib/usercopy_64.c
3464+++ b/arch/powerpc/lib/usercopy_64.c
3465@@ -9,22 +9,6 @@
3466 #include <linux/module.h>
3467 #include <asm/uaccess.h>
3468
3469-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
3470-{
3471- if (likely(access_ok(VERIFY_READ, from, n)))
3472- n = __copy_from_user(to, from, n);
3473- else
3474- memset(to, 0, n);
3475- return n;
3476-}
3477-
3478-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
3479-{
3480- if (likely(access_ok(VERIFY_WRITE, to, n)))
3481- n = __copy_to_user(to, from, n);
3482- return n;
3483-}
3484-
3485 unsigned long copy_in_user(void __user *to, const void __user *from,
3486 unsigned long n)
3487 {
3488@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
3489 return n;
3490 }
3491
3492-EXPORT_SYMBOL(copy_from_user);
3493-EXPORT_SYMBOL(copy_to_user);
3494 EXPORT_SYMBOL(copy_in_user);
3495
3496diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
3497index e7dae82..877ce0d 100644
3498--- a/arch/powerpc/mm/fault.c
3499+++ b/arch/powerpc/mm/fault.c
3500@@ -30,6 +30,10 @@
3501 #include <linux/kprobes.h>
3502 #include <linux/kdebug.h>
3503 #include <linux/perf_event.h>
3504+#include <linux/slab.h>
3505+#include <linux/pagemap.h>
3506+#include <linux/compiler.h>
3507+#include <linux/unistd.h>
3508
3509 #include <asm/firmware.h>
3510 #include <asm/page.h>
3511@@ -40,6 +44,7 @@
3512 #include <asm/uaccess.h>
3513 #include <asm/tlbflush.h>
3514 #include <asm/siginfo.h>
3515+#include <asm/ptrace.h>
3516
3517
3518 #ifdef CONFIG_KPROBES
3519@@ -64,6 +69,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
3520 }
3521 #endif
3522
3523+#ifdef CONFIG_PAX_PAGEEXEC
3524+/*
3525+ * PaX: decide what to do with offenders (regs->nip = fault address)
3526+ *
3527+ * returns 1 when task should be killed
3528+ */
3529+static int pax_handle_fetch_fault(struct pt_regs *regs)
3530+{
3531+ return 1;
3532+}
3533+
3534+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3535+{
3536+ unsigned long i;
3537+
3538+ printk(KERN_ERR "PAX: bytes at PC: ");
3539+ for (i = 0; i < 5; i++) {
3540+ unsigned int c;
3541+ if (get_user(c, (unsigned int __user *)pc+i))
3542+ printk(KERN_CONT "???????? ");
3543+ else
3544+ printk(KERN_CONT "%08x ", c);
3545+ }
3546+ printk("\n");
3547+}
3548+#endif
3549+
3550 /*
3551 * Check whether the instruction at regs->nip is a store using
3552 * an update addressing form which will update r1.
3553@@ -134,7 +166,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
3554 * indicate errors in DSISR but can validly be set in SRR1.
3555 */
3556 if (trap == 0x400)
3557- error_code &= 0x48200000;
3558+ error_code &= 0x58200000;
3559 else
3560 is_write = error_code & DSISR_ISSTORE;
3561 #else
3562@@ -250,7 +282,7 @@ good_area:
3563 * "undefined". Of those that can be set, this is the only
3564 * one which seems bad.
3565 */
3566- if (error_code & 0x10000000)
3567+ if (error_code & DSISR_GUARDED)
3568 /* Guarded storage error. */
3569 goto bad_area;
3570 #endif /* CONFIG_8xx */
3571@@ -265,7 +297,7 @@ good_area:
3572 * processors use the same I/D cache coherency mechanism
3573 * as embedded.
3574 */
3575- if (error_code & DSISR_PROTFAULT)
3576+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
3577 goto bad_area;
3578 #endif /* CONFIG_PPC_STD_MMU */
3579
3580@@ -335,6 +367,23 @@ bad_area:
3581 bad_area_nosemaphore:
3582 /* User mode accesses cause a SIGSEGV */
3583 if (user_mode(regs)) {
3584+
3585+#ifdef CONFIG_PAX_PAGEEXEC
3586+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
3587+#ifdef CONFIG_PPC_STD_MMU
3588+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
3589+#else
3590+ if (is_exec && regs->nip == address) {
3591+#endif
3592+ switch (pax_handle_fetch_fault(regs)) {
3593+ }
3594+
3595+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
3596+ do_group_exit(SIGKILL);
3597+ }
3598+ }
3599+#endif
3600+
3601 _exception(SIGSEGV, regs, code, address);
3602 return 0;
3603 }
3604diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
3605index 5973631..ad617af 100644
3606--- a/arch/powerpc/mm/mem.c
3607+++ b/arch/powerpc/mm/mem.c
3608@@ -250,7 +250,7 @@ static int __init mark_nonram_nosave(void)
3609 {
3610 unsigned long lmb_next_region_start_pfn,
3611 lmb_region_max_pfn;
3612- int i;
3613+ unsigned int i;
3614
3615 for (i = 0; i < lmb.memory.cnt - 1; i++) {
3616 lmb_region_max_pfn =
3617diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
3618index 0d957a4..26d968f 100644
3619--- a/arch/powerpc/mm/mmap_64.c
3620+++ b/arch/powerpc/mm/mmap_64.c
3621@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
3622 */
3623 if (mmap_is_legacy()) {
3624 mm->mmap_base = TASK_UNMAPPED_BASE;
3625+
3626+#ifdef CONFIG_PAX_RANDMMAP
3627+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3628+ mm->mmap_base += mm->delta_mmap;
3629+#endif
3630+
3631 mm->get_unmapped_area = arch_get_unmapped_area;
3632 mm->unmap_area = arch_unmap_area;
3633 } else {
3634 mm->mmap_base = mmap_base();
3635+
3636+#ifdef CONFIG_PAX_RANDMMAP
3637+ if (mm->pax_flags & MF_PAX_RANDMMAP)
3638+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
3639+#endif
3640+
3641 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3642 mm->unmap_area = arch_unmap_area_topdown;
3643 }
3644diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
3645index ba51948..23009d9 100644
3646--- a/arch/powerpc/mm/slice.c
3647+++ b/arch/powerpc/mm/slice.c
3648@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
3649 if ((mm->task_size - len) < addr)
3650 return 0;
3651 vma = find_vma(mm, addr);
3652- return (!vma || (addr + len) <= vma->vm_start);
3653+ return check_heap_stack_gap(vma, addr, len);
3654 }
3655
3656 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
3657@@ -256,7 +256,7 @@ full_search:
3658 addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
3659 continue;
3660 }
3661- if (!vma || addr + len <= vma->vm_start) {
3662+ if (check_heap_stack_gap(vma, addr, len)) {
3663 /*
3664 * Remember the place where we stopped the search:
3665 */
3666@@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
3667 }
3668 }
3669
3670- addr = mm->mmap_base;
3671- while (addr > len) {
3672+ if (mm->mmap_base < len)
3673+ addr = -ENOMEM;
3674+ else
3675+ addr = mm->mmap_base - len;
3676+
3677+ while (!IS_ERR_VALUE(addr)) {
3678 /* Go down by chunk size */
3679- addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
3680+ addr = _ALIGN_DOWN(addr, 1ul << pshift);
3681
3682 /* Check for hit with different page size */
3683 mask = slice_range_to_mask(addr, len);
3684@@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
3685 * return with success:
3686 */
3687 vma = find_vma(mm, addr);
3688- if (!vma || (addr + len) <= vma->vm_start) {
3689+ if (check_heap_stack_gap(vma, addr, len)) {
3690 /* remember the address as a hint for next time */
3691 if (use_cache)
3692 mm->free_area_cache = addr;
3693@@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
3694 mm->cached_hole_size = vma->vm_start - addr;
3695
3696 /* try just below the current vma->vm_start */
3697- addr = vma->vm_start;
3698+ addr = skip_heap_stack_gap(vma, len);
3699 }
3700
3701 /*
3702@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
3703 if (fixed && addr > (mm->task_size - len))
3704 return -EINVAL;
3705
3706+#ifdef CONFIG_PAX_RANDMMAP
3707+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
3708+ addr = 0;
3709+#endif
3710+
3711 /* If hint, make sure it matches our alignment restrictions */
3712 if (!fixed && addr) {
3713 addr = _ALIGN_UP(addr, 1ul << pshift);
3714diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c
3715index b5c753d..8f01abe 100644
3716--- a/arch/powerpc/platforms/52xx/lite5200_pm.c
3717+++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
3718@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
3719 lite5200_pm_target_state = PM_SUSPEND_ON;
3720 }
3721
3722-static struct platform_suspend_ops lite5200_pm_ops = {
3723+static const struct platform_suspend_ops lite5200_pm_ops = {
3724 .valid = lite5200_pm_valid,
3725 .begin = lite5200_pm_begin,
3726 .prepare = lite5200_pm_prepare,
3727diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
3728index a55b0b6..478c18e 100644
3729--- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
3730+++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
3731@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
3732 iounmap(mbar);
3733 }
3734
3735-static struct platform_suspend_ops mpc52xx_pm_ops = {
3736+static const struct platform_suspend_ops mpc52xx_pm_ops = {
3737 .valid = mpc52xx_pm_valid,
3738 .prepare = mpc52xx_pm_prepare,
3739 .enter = mpc52xx_pm_enter,
3740diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
3741index 08e65fc..643d3ac 100644
3742--- a/arch/powerpc/platforms/83xx/suspend.c
3743+++ b/arch/powerpc/platforms/83xx/suspend.c
3744@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
3745 return ret;
3746 }
3747
3748-static struct platform_suspend_ops mpc83xx_suspend_ops = {
3749+static const struct platform_suspend_ops mpc83xx_suspend_ops = {
3750 .valid = mpc83xx_suspend_valid,
3751 .begin = mpc83xx_suspend_begin,
3752 .enter = mpc83xx_suspend_enter,
3753diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
3754index ca5bfdf..1602e09 100644
3755--- a/arch/powerpc/platforms/cell/iommu.c
3756+++ b/arch/powerpc/platforms/cell/iommu.c
3757@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struct device *dev, u64 mask)
3758
3759 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
3760
3761-struct dma_map_ops dma_iommu_fixed_ops = {
3762+const struct dma_map_ops dma_iommu_fixed_ops = {
3763 .alloc_coherent = dma_fixed_alloc_coherent,
3764 .free_coherent = dma_fixed_free_coherent,
3765 .map_sg = dma_fixed_map_sg,
3766diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
3767index e34b305..20e48ec 100644
3768--- a/arch/powerpc/platforms/ps3/system-bus.c
3769+++ b/arch/powerpc/platforms/ps3/system-bus.c
3770@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct device *_dev, u64 mask)
3771 return mask >= DMA_BIT_MASK(32);
3772 }
3773
3774-static struct dma_map_ops ps3_sb_dma_ops = {
3775+static const struct dma_map_ops ps3_sb_dma_ops = {
3776 .alloc_coherent = ps3_alloc_coherent,
3777 .free_coherent = ps3_free_coherent,
3778 .map_sg = ps3_sb_map_sg,
3779@@ -704,7 +704,7 @@ static struct dma_map_ops ps3_sb_dma_ops = {
3780 .unmap_page = ps3_unmap_page,
3781 };
3782
3783-static struct dma_map_ops ps3_ioc0_dma_ops = {
3784+static const struct dma_map_ops ps3_ioc0_dma_ops = {
3785 .alloc_coherent = ps3_alloc_coherent,
3786 .free_coherent = ps3_free_coherent,
3787 .map_sg = ps3_ioc0_map_sg,
3788diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
3789index f0e6f28..60d53ed 100644
3790--- a/arch/powerpc/platforms/pseries/Kconfig
3791+++ b/arch/powerpc/platforms/pseries/Kconfig
3792@@ -2,6 +2,8 @@ config PPC_PSERIES
3793 depends on PPC64 && PPC_BOOK3S
3794 bool "IBM pSeries & new (POWER5-based) iSeries"
3795 select MPIC
3796+ select PCI_MSI
3797+ select XICS
3798 select PPC_I8259
3799 select PPC_RTAS
3800 select RTAS_ERROR_LOGGING
3801diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
3802index 43c0aca..42c045b 100644
3803--- a/arch/s390/Kconfig
3804+++ b/arch/s390/Kconfig
3805@@ -194,28 +194,26 @@ config AUDIT_ARCH
3806
3807 config S390_SWITCH_AMODE
3808 bool "Switch kernel/user addressing modes"
3809+ default y
3810 help
3811 This option allows to switch the addressing modes of kernel and user
3812- space. The kernel parameter switch_amode=on will enable this feature,
3813- default is disabled. Enabling this (via kernel parameter) on machines
3814- earlier than IBM System z9-109 EC/BC will reduce system performance.
3815+ space. Enabling this on machines earlier than IBM System z9-109 EC/BC
3816+ will reduce system performance.
3817
3818 Note that this option will also be selected by selecting the execute
3819- protection option below. Enabling the execute protection via the
3820- noexec kernel parameter will also switch the addressing modes,
3821- independent of the switch_amode kernel parameter.
3822+ protection option below. Enabling the execute protection will also
3823+ switch the addressing modes, independent of this option.
3824
3825
3826 config S390_EXEC_PROTECT
3827 bool "Data execute protection"
3828+ default y
3829 select S390_SWITCH_AMODE
3830 help
3831 This option allows to enable a buffer overflow protection for user
3832 space programs and it also selects the addressing mode option above.
3833- The kernel parameter noexec=on will enable this feature and also
3834- switch the addressing modes, default is disabled. Enabling this (via
3835- kernel parameter) on machines earlier than IBM System z9-109 EC/BC
3836- will reduce system performance.
3837+ Enabling this on machines earlier than IBM System z9-109 EC/BC will
3838+ reduce system performance.
3839
3840 comment "Code generation options"
3841
3842diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
3843index e885442..e3a2817 100644
3844--- a/arch/s390/include/asm/elf.h
3845+++ b/arch/s390/include/asm/elf.h
3846@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
3847 that it will "exec", and that there is sufficient room for the brk. */
3848 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
3849
3850+#ifdef CONFIG_PAX_ASLR
3851+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
3852+
3853+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
3854+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
3855+#endif
3856+
3857 /* This yields a mask that user programs can use to figure out what
3858 instruction set this CPU supports. */
3859
3860diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
3861index e37478e..9ce0e9f 100644
3862--- a/arch/s390/include/asm/setup.h
3863+++ b/arch/s390/include/asm/setup.h
3864@@ -50,13 +50,13 @@ extern unsigned long memory_end;
3865 void detect_memory_layout(struct mem_chunk chunk[]);
3866
3867 #ifdef CONFIG_S390_SWITCH_AMODE
3868-extern unsigned int switch_amode;
3869+#define switch_amode (1)
3870 #else
3871 #define switch_amode (0)
3872 #endif
3873
3874 #ifdef CONFIG_S390_EXEC_PROTECT
3875-extern unsigned int s390_noexec;
3876+#define s390_noexec (1)
3877 #else
3878 #define s390_noexec (0)
3879 #endif
3880diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
3881index 8377e91..e28e6f1 100644
3882--- a/arch/s390/include/asm/uaccess.h
3883+++ b/arch/s390/include/asm/uaccess.h
3884@@ -232,6 +232,10 @@ static inline unsigned long __must_check
3885 copy_to_user(void __user *to, const void *from, unsigned long n)
3886 {
3887 might_fault();
3888+
3889+ if ((long)n < 0)
3890+ return n;
3891+
3892 if (access_ok(VERIFY_WRITE, to, n))
3893 n = __copy_to_user(to, from, n);
3894 return n;
3895@@ -257,6 +261,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
3896 static inline unsigned long __must_check
3897 __copy_from_user(void *to, const void __user *from, unsigned long n)
3898 {
3899+ if ((long)n < 0)
3900+ return n;
3901+
3902 if (__builtin_constant_p(n) && (n <= 256))
3903 return uaccess.copy_from_user_small(n, from, to);
3904 else
3905@@ -283,6 +290,10 @@ static inline unsigned long __must_check
3906 copy_from_user(void *to, const void __user *from, unsigned long n)
3907 {
3908 might_fault();
3909+
3910+ if ((long)n < 0)
3911+ return n;
3912+
3913 if (access_ok(VERIFY_READ, from, n))
3914 n = __copy_from_user(to, from, n);
3915 else
3916diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
3917index 639380a..72e3c02 100644
3918--- a/arch/s390/kernel/module.c
3919+++ b/arch/s390/kernel/module.c
3920@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
3921
3922 /* Increase core size by size of got & plt and set start
3923 offsets for got and plt. */
3924- me->core_size = ALIGN(me->core_size, 4);
3925- me->arch.got_offset = me->core_size;
3926- me->core_size += me->arch.got_size;
3927- me->arch.plt_offset = me->core_size;
3928- me->core_size += me->arch.plt_size;
3929+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
3930+ me->arch.got_offset = me->core_size_rw;
3931+ me->core_size_rw += me->arch.got_size;
3932+ me->arch.plt_offset = me->core_size_rx;
3933+ me->core_size_rx += me->arch.plt_size;
3934 return 0;
3935 }
3936
3937@@ -256,7 +256,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3938 if (info->got_initialized == 0) {
3939 Elf_Addr *gotent;
3940
3941- gotent = me->module_core + me->arch.got_offset +
3942+ gotent = me->module_core_rw + me->arch.got_offset +
3943 info->got_offset;
3944 *gotent = val;
3945 info->got_initialized = 1;
3946@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3947 else if (r_type == R_390_GOTENT ||
3948 r_type == R_390_GOTPLTENT)
3949 *(unsigned int *) loc =
3950- (val + (Elf_Addr) me->module_core - loc) >> 1;
3951+ (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
3952 else if (r_type == R_390_GOT64 ||
3953 r_type == R_390_GOTPLT64)
3954 *(unsigned long *) loc = val;
3955@@ -294,7 +294,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3956 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
3957 if (info->plt_initialized == 0) {
3958 unsigned int *ip;
3959- ip = me->module_core + me->arch.plt_offset +
3960+ ip = me->module_core_rx + me->arch.plt_offset +
3961 info->plt_offset;
3962 #ifndef CONFIG_64BIT
3963 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
3964@@ -319,7 +319,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3965 val - loc + 0xffffUL < 0x1ffffeUL) ||
3966 (r_type == R_390_PLT32DBL &&
3967 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
3968- val = (Elf_Addr) me->module_core +
3969+ val = (Elf_Addr) me->module_core_rx +
3970 me->arch.plt_offset +
3971 info->plt_offset;
3972 val += rela->r_addend - loc;
3973@@ -341,7 +341,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3974 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
3975 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
3976 val = val + rela->r_addend -
3977- ((Elf_Addr) me->module_core + me->arch.got_offset);
3978+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
3979 if (r_type == R_390_GOTOFF16)
3980 *(unsigned short *) loc = val;
3981 else if (r_type == R_390_GOTOFF32)
3982@@ -351,7 +351,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3983 break;
3984 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
3985 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
3986- val = (Elf_Addr) me->module_core + me->arch.got_offset +
3987+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
3988 rela->r_addend - loc;
3989 if (r_type == R_390_GOTPC)
3990 *(unsigned int *) loc = val;
3991diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
3992index 061479f..dbfb08c 100644
3993--- a/arch/s390/kernel/setup.c
3994+++ b/arch/s390/kernel/setup.c
3995@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *p)
3996 early_param("mem", early_parse_mem);
3997
3998 #ifdef CONFIG_S390_SWITCH_AMODE
3999-unsigned int switch_amode = 0;
4000-EXPORT_SYMBOL_GPL(switch_amode);
4001-
4002 static int set_amode_and_uaccess(unsigned long user_amode,
4003 unsigned long user32_amode)
4004 {
4005@@ -334,17 +331,6 @@ static int set_amode_and_uaccess(unsigned long user_amode,
4006 return 0;
4007 }
4008 }
4009-
4010-/*
4011- * Switch kernel/user addressing modes?
4012- */
4013-static int __init early_parse_switch_amode(char *p)
4014-{
4015- switch_amode = 1;
4016- return 0;
4017-}
4018-early_param("switch_amode", early_parse_switch_amode);
4019-
4020 #else /* CONFIG_S390_SWITCH_AMODE */
4021 static inline int set_amode_and_uaccess(unsigned long user_amode,
4022 unsigned long user32_amode)
4023@@ -353,24 +339,6 @@ static inline int set_amode_and_uaccess(unsigned long user_amode,
4024 }
4025 #endif /* CONFIG_S390_SWITCH_AMODE */
4026
4027-#ifdef CONFIG_S390_EXEC_PROTECT
4028-unsigned int s390_noexec = 0;
4029-EXPORT_SYMBOL_GPL(s390_noexec);
4030-
4031-/*
4032- * Enable execute protection?
4033- */
4034-static int __init early_parse_noexec(char *p)
4035-{
4036- if (!strncmp(p, "off", 3))
4037- return 0;
4038- switch_amode = 1;
4039- s390_noexec = 1;
4040- return 0;
4041-}
4042-early_param("noexec", early_parse_noexec);
4043-#endif /* CONFIG_S390_EXEC_PROTECT */
4044-
4045 static void setup_addressing_mode(void)
4046 {
4047 if (s390_noexec) {
4048diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
4049index f4558cc..e461f37 100644
4050--- a/arch/s390/mm/mmap.c
4051+++ b/arch/s390/mm/mmap.c
4052@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4053 */
4054 if (mmap_is_legacy()) {
4055 mm->mmap_base = TASK_UNMAPPED_BASE;
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 mm->mmap_base = mmap_base();
4066+
4067+#ifdef CONFIG_PAX_RANDMMAP
4068+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4069+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4070+#endif
4071+
4072 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4073 mm->unmap_area = arch_unmap_area_topdown;
4074 }
4075@@ -153,10 +165,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4076 */
4077 if (mmap_is_legacy()) {
4078 mm->mmap_base = TASK_UNMAPPED_BASE;
4079+
4080+#ifdef CONFIG_PAX_RANDMMAP
4081+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4082+ mm->mmap_base += mm->delta_mmap;
4083+#endif
4084+
4085 mm->get_unmapped_area = s390_get_unmapped_area;
4086 mm->unmap_area = arch_unmap_area;
4087 } else {
4088 mm->mmap_base = mmap_base();
4089+
4090+#ifdef CONFIG_PAX_RANDMMAP
4091+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4092+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4093+#endif
4094+
4095 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
4096 mm->unmap_area = arch_unmap_area_topdown;
4097 }
4098diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h
4099index 589d5c7..669e274 100644
4100--- a/arch/score/include/asm/system.h
4101+++ b/arch/score/include/asm/system.h
4102@@ -17,7 +17,7 @@ do { \
4103 #define finish_arch_switch(prev) do {} while (0)
4104
4105 typedef void (*vi_handler_t)(void);
4106-extern unsigned long arch_align_stack(unsigned long sp);
4107+#define arch_align_stack(x) (x)
4108
4109 #define mb() barrier()
4110 #define rmb() barrier()
4111diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
4112index 25d0803..d6c8e36 100644
4113--- a/arch/score/kernel/process.c
4114+++ b/arch/score/kernel/process.c
4115@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task)
4116
4117 return task_pt_regs(task)->cp0_epc;
4118 }
4119-
4120-unsigned long arch_align_stack(unsigned long sp)
4121-{
4122- return sp;
4123-}
4124diff --git a/arch/sh/boards/mach-hp6xx/pm.c b/arch/sh/boards/mach-hp6xx/pm.c
4125index d936c1a..304a252 100644
4126--- a/arch/sh/boards/mach-hp6xx/pm.c
4127+++ b/arch/sh/boards/mach-hp6xx/pm.c
4128@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_t state)
4129 return 0;
4130 }
4131
4132-static struct platform_suspend_ops hp6x0_pm_ops = {
4133+static const struct platform_suspend_ops hp6x0_pm_ops = {
4134 .enter = hp6x0_pm_enter,
4135 .valid = suspend_valid_only_mem,
4136 };
4137diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
4138index 8a8a993..7b3079b 100644
4139--- a/arch/sh/kernel/cpu/sh4/sq.c
4140+++ b/arch/sh/kernel/cpu/sh4/sq.c
4141@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[] = {
4142 NULL,
4143 };
4144
4145-static struct sysfs_ops sq_sysfs_ops = {
4146+static const struct sysfs_ops sq_sysfs_ops = {
4147 .show = sq_sysfs_show,
4148 .store = sq_sysfs_store,
4149 };
4150diff --git a/arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/shmobile/pm.c
4151index ee3c2aa..c49cee6 100644
4152--- a/arch/sh/kernel/cpu/shmobile/pm.c
4153+++ b/arch/sh/kernel/cpu/shmobile/pm.c
4154@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t state)
4155 return 0;
4156 }
4157
4158-static struct platform_suspend_ops sh_pm_ops = {
4159+static const struct platform_suspend_ops sh_pm_ops = {
4160 .enter = sh_pm_enter,
4161 .valid = suspend_valid_only_mem,
4162 };
4163diff --git a/arch/sh/kernel/kgdb.c b/arch/sh/kernel/kgdb.c
4164index 3e532d0..9faa306 100644
4165--- a/arch/sh/kernel/kgdb.c
4166+++ b/arch/sh/kernel/kgdb.c
4167@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
4168 {
4169 }
4170
4171-struct kgdb_arch arch_kgdb_ops = {
4172+const struct kgdb_arch arch_kgdb_ops = {
4173 /* Breakpoint instruction: trapa #0x3c */
4174 #ifdef CONFIG_CPU_LITTLE_ENDIAN
4175 .gdb_bpt_instr = { 0x3c, 0xc3 },
4176diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
4177index afeb710..d1d1289 100644
4178--- a/arch/sh/mm/mmap.c
4179+++ b/arch/sh/mm/mmap.c
4180@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
4181 addr = PAGE_ALIGN(addr);
4182
4183 vma = find_vma(mm, addr);
4184- if (TASK_SIZE - len >= addr &&
4185- (!vma || addr + len <= vma->vm_start))
4186+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4187 return addr;
4188 }
4189
4190@@ -106,7 +105,7 @@ full_search:
4191 }
4192 return -ENOMEM;
4193 }
4194- if (likely(!vma || addr + len <= vma->vm_start)) {
4195+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4196 /*
4197 * Remember the place where we stopped the search:
4198 */
4199@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4200 addr = PAGE_ALIGN(addr);
4201
4202 vma = find_vma(mm, addr);
4203- if (TASK_SIZE - len >= addr &&
4204- (!vma || addr + len <= vma->vm_start))
4205+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4206 return addr;
4207 }
4208
4209@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4210 /* make sure it can fit in the remaining address space */
4211 if (likely(addr > len)) {
4212 vma = find_vma(mm, addr-len);
4213- if (!vma || addr <= vma->vm_start) {
4214+ if (check_heap_stack_gap(vma, addr - len, len)) {
4215 /* remember the address as a hint for next time */
4216 return (mm->free_area_cache = addr-len);
4217 }
4218@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4219 if (unlikely(mm->mmap_base < len))
4220 goto bottomup;
4221
4222- addr = mm->mmap_base-len;
4223- if (do_colour_align)
4224- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4225+ addr = mm->mmap_base - len;
4226
4227 do {
4228+ if (do_colour_align)
4229+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4230 /*
4231 * Lookup failure means no vma is above this address,
4232 * else if new region fits below vma->vm_start,
4233 * return with success:
4234 */
4235 vma = find_vma(mm, addr);
4236- if (likely(!vma || addr+len <= vma->vm_start)) {
4237+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4238 /* remember the address as a hint for next time */
4239 return (mm->free_area_cache = addr);
4240 }
4241@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4242 mm->cached_hole_size = vma->vm_start - addr;
4243
4244 /* try just below the current vma->vm_start */
4245- addr = vma->vm_start-len;
4246- if (do_colour_align)
4247- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4248- } while (likely(len < vma->vm_start));
4249+ addr = skip_heap_stack_gap(vma, len);
4250+ } while (!IS_ERR_VALUE(addr));
4251
4252 bottomup:
4253 /*
4254diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
4255index 113225b..7fd04e7 100644
4256--- a/arch/sparc/Makefile
4257+++ b/arch/sparc/Makefile
4258@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
4259 # Export what is needed by arch/sparc/boot/Makefile
4260 export VMLINUX_INIT VMLINUX_MAIN
4261 VMLINUX_INIT := $(head-y) $(init-y)
4262-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
4263+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
4264 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
4265 VMLINUX_MAIN += $(drivers-y) $(net-y)
4266
4267diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
4268index f5cc06f..f858d47 100644
4269--- a/arch/sparc/include/asm/atomic_64.h
4270+++ b/arch/sparc/include/asm/atomic_64.h
4271@@ -14,18 +14,40 @@
4272 #define ATOMIC64_INIT(i) { (i) }
4273
4274 #define atomic_read(v) ((v)->counter)
4275+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
4276+{
4277+ return v->counter;
4278+}
4279 #define atomic64_read(v) ((v)->counter)
4280+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
4281+{
4282+ return v->counter;
4283+}
4284
4285 #define atomic_set(v, i) (((v)->counter) = i)
4286+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
4287+{
4288+ v->counter = i;
4289+}
4290 #define atomic64_set(v, i) (((v)->counter) = i)
4291+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
4292+{
4293+ v->counter = i;
4294+}
4295
4296 extern void atomic_add(int, atomic_t *);
4297+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
4298 extern void atomic64_add(long, atomic64_t *);
4299+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
4300 extern void atomic_sub(int, atomic_t *);
4301+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
4302 extern void atomic64_sub(long, atomic64_t *);
4303+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
4304
4305 extern int atomic_add_ret(int, atomic_t *);
4306+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
4307 extern long atomic64_add_ret(long, atomic64_t *);
4308+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
4309 extern int atomic_sub_ret(int, atomic_t *);
4310 extern long atomic64_sub_ret(long, atomic64_t *);
4311
4312@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4313 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
4314
4315 #define atomic_inc_return(v) atomic_add_ret(1, v)
4316+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
4317+{
4318+ return atomic_add_ret_unchecked(1, v);
4319+}
4320 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
4321+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
4322+{
4323+ return atomic64_add_ret_unchecked(1, v);
4324+}
4325
4326 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
4327 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
4328
4329 #define atomic_add_return(i, v) atomic_add_ret(i, v)
4330+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
4331+{
4332+ return atomic_add_ret_unchecked(i, v);
4333+}
4334 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
4335+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
4336+{
4337+ return atomic64_add_ret_unchecked(i, v);
4338+}
4339
4340 /*
4341 * atomic_inc_and_test - increment and test
4342@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4343 * other cases.
4344 */
4345 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
4346+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
4347+{
4348+ return atomic_inc_return_unchecked(v) == 0;
4349+}
4350 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
4351
4352 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
4353@@ -59,30 +101,65 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4354 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
4355
4356 #define atomic_inc(v) atomic_add(1, v)
4357+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
4358+{
4359+ atomic_add_unchecked(1, v);
4360+}
4361 #define atomic64_inc(v) atomic64_add(1, v)
4362+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
4363+{
4364+ atomic64_add_unchecked(1, v);
4365+}
4366
4367 #define atomic_dec(v) atomic_sub(1, v)
4368+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
4369+{
4370+ atomic_sub_unchecked(1, v);
4371+}
4372 #define atomic64_dec(v) atomic64_sub(1, v)
4373+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
4374+{
4375+ atomic64_sub_unchecked(1, v);
4376+}
4377
4378 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
4379 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
4380
4381 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
4382+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
4383+{
4384+ return cmpxchg(&v->counter, old, new);
4385+}
4386 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
4387+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
4388+{
4389+ return xchg(&v->counter, new);
4390+}
4391
4392 static inline int atomic_add_unless(atomic_t *v, int a, int u)
4393 {
4394- int c, old;
4395+ int c, old, new;
4396 c = atomic_read(v);
4397 for (;;) {
4398- if (unlikely(c == (u)))
4399+ if (unlikely(c == u))
4400 break;
4401- old = atomic_cmpxchg((v), c, c + (a));
4402+
4403+ asm volatile("addcc %2, %0, %0\n"
4404+
4405+#ifdef CONFIG_PAX_REFCOUNT
4406+ "tvs %%icc, 6\n"
4407+#endif
4408+
4409+ : "=r" (new)
4410+ : "0" (c), "ir" (a)
4411+ : "cc");
4412+
4413+ old = atomic_cmpxchg(v, c, new);
4414 if (likely(old == c))
4415 break;
4416 c = old;
4417 }
4418- return c != (u);
4419+ return c != u;
4420 }
4421
4422 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
4423@@ -90,20 +167,35 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
4424 #define atomic64_cmpxchg(v, o, n) \
4425 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
4426 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
4427+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
4428+{
4429+ return xchg(&v->counter, new);
4430+}
4431
4432 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
4433 {
4434- long c, old;
4435+ long c, old, new;
4436 c = atomic64_read(v);
4437 for (;;) {
4438- if (unlikely(c == (u)))
4439+ if (unlikely(c == u))
4440 break;
4441- old = atomic64_cmpxchg((v), c, c + (a));
4442+
4443+ asm volatile("addcc %2, %0, %0\n"
4444+
4445+#ifdef CONFIG_PAX_REFCOUNT
4446+ "tvs %%xcc, 6\n"
4447+#endif
4448+
4449+ : "=r" (new)
4450+ : "0" (c), "ir" (a)
4451+ : "cc");
4452+
4453+ old = atomic64_cmpxchg(v, c, new);
4454 if (likely(old == c))
4455 break;
4456 c = old;
4457 }
4458- return c != (u);
4459+ return c != u;
4460 }
4461
4462 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4463diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
4464index 41f85ae..fb54d5e 100644
4465--- a/arch/sparc/include/asm/cache.h
4466+++ b/arch/sparc/include/asm/cache.h
4467@@ -8,7 +8,7 @@
4468 #define _SPARC_CACHE_H
4469
4470 #define L1_CACHE_SHIFT 5
4471-#define L1_CACHE_BYTES 32
4472+#define L1_CACHE_BYTES 32UL
4473 #define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1)))
4474
4475 #ifdef CONFIG_SPARC32
4476diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
4477index 5a8c308..38def92 100644
4478--- a/arch/sparc/include/asm/dma-mapping.h
4479+++ b/arch/sparc/include/asm/dma-mapping.h
4480@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *dev, u64 dma_mask);
4481 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
4482 #define dma_is_consistent(d, h) (1)
4483
4484-extern struct dma_map_ops *dma_ops, pci32_dma_ops;
4485+extern const struct dma_map_ops *dma_ops, pci32_dma_ops;
4486 extern struct bus_type pci_bus_type;
4487
4488-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
4489+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
4490 {
4491 #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
4492 if (dev->bus == &pci_bus_type)
4493@@ -31,7 +31,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
4494 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
4495 dma_addr_t *dma_handle, gfp_t flag)
4496 {
4497- struct dma_map_ops *ops = get_dma_ops(dev);
4498+ const struct dma_map_ops *ops = get_dma_ops(dev);
4499 void *cpu_addr;
4500
4501 cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag);
4502@@ -42,7 +42,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
4503 static inline void dma_free_coherent(struct device *dev, size_t size,
4504 void *cpu_addr, dma_addr_t dma_handle)
4505 {
4506- struct dma_map_ops *ops = get_dma_ops(dev);
4507+ const struct dma_map_ops *ops = get_dma_ops(dev);
4508
4509 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
4510 ops->free_coherent(dev, size, cpu_addr, dma_handle);
4511diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
4512index 381a1b5..b97e3ff 100644
4513--- a/arch/sparc/include/asm/elf_32.h
4514+++ b/arch/sparc/include/asm/elf_32.h
4515@@ -116,6 +116,13 @@ typedef struct {
4516
4517 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
4518
4519+#ifdef CONFIG_PAX_ASLR
4520+#define PAX_ELF_ET_DYN_BASE 0x10000UL
4521+
4522+#define PAX_DELTA_MMAP_LEN 16
4523+#define PAX_DELTA_STACK_LEN 16
4524+#endif
4525+
4526 /* This yields a mask that user programs can use to figure out what
4527 instruction set this cpu supports. This can NOT be done in userspace
4528 on Sparc. */
4529diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
4530index 9968085..c2106ef 100644
4531--- a/arch/sparc/include/asm/elf_64.h
4532+++ b/arch/sparc/include/asm/elf_64.h
4533@@ -163,6 +163,12 @@ typedef struct {
4534 #define ELF_ET_DYN_BASE 0x0000010000000000UL
4535 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
4536
4537+#ifdef CONFIG_PAX_ASLR
4538+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
4539+
4540+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
4541+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
4542+#endif
4543
4544 /* This yields a mask that user programs can use to figure out what
4545 instruction set this cpu supports. */
4546diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
4547index e0cabe7..efd60f1 100644
4548--- a/arch/sparc/include/asm/pgtable_32.h
4549+++ b/arch/sparc/include/asm/pgtable_32.h
4550@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
4551 BTFIXUPDEF_INT(page_none)
4552 BTFIXUPDEF_INT(page_copy)
4553 BTFIXUPDEF_INT(page_readonly)
4554+
4555+#ifdef CONFIG_PAX_PAGEEXEC
4556+BTFIXUPDEF_INT(page_shared_noexec)
4557+BTFIXUPDEF_INT(page_copy_noexec)
4558+BTFIXUPDEF_INT(page_readonly_noexec)
4559+#endif
4560+
4561 BTFIXUPDEF_INT(page_kernel)
4562
4563 #define PMD_SHIFT SUN4C_PMD_SHIFT
4564@@ -64,6 +71,16 @@ extern pgprot_t PAGE_SHARED;
4565 #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy))
4566 #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly))
4567
4568+#ifdef CONFIG_PAX_PAGEEXEC
4569+extern pgprot_t PAGE_SHARED_NOEXEC;
4570+# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec))
4571+# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec))
4572+#else
4573+# define PAGE_SHARED_NOEXEC PAGE_SHARED
4574+# define PAGE_COPY_NOEXEC PAGE_COPY
4575+# define PAGE_READONLY_NOEXEC PAGE_READONLY
4576+#endif
4577+
4578 extern unsigned long page_kernel;
4579
4580 #ifdef MODULE
4581diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
4582index 1407c07..7e10231 100644
4583--- a/arch/sparc/include/asm/pgtsrmmu.h
4584+++ b/arch/sparc/include/asm/pgtsrmmu.h
4585@@ -115,6 +115,13 @@
4586 SRMMU_EXEC | SRMMU_REF)
4587 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
4588 SRMMU_EXEC | SRMMU_REF)
4589+
4590+#ifdef CONFIG_PAX_PAGEEXEC
4591+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
4592+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4593+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4594+#endif
4595+
4596 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
4597 SRMMU_DIRTY | SRMMU_REF)
4598
4599diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
4600index 43e5147..47622a1 100644
4601--- a/arch/sparc/include/asm/spinlock_64.h
4602+++ b/arch/sparc/include/asm/spinlock_64.h
4603@@ -92,14 +92,19 @@ static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long fla
4604
4605 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
4606
4607-static void inline arch_read_lock(raw_rwlock_t *lock)
4608+static inline void arch_read_lock(raw_rwlock_t *lock)
4609 {
4610 unsigned long tmp1, tmp2;
4611
4612 __asm__ __volatile__ (
4613 "1: ldsw [%2], %0\n"
4614 " brlz,pn %0, 2f\n"
4615-"4: add %0, 1, %1\n"
4616+"4: addcc %0, 1, %1\n"
4617+
4618+#ifdef CONFIG_PAX_REFCOUNT
4619+" tvs %%icc, 6\n"
4620+#endif
4621+
4622 " cas [%2], %0, %1\n"
4623 " cmp %0, %1\n"
4624 " bne,pn %%icc, 1b\n"
4625@@ -112,10 +117,10 @@ static void inline arch_read_lock(raw_rwlock_t *lock)
4626 " .previous"
4627 : "=&r" (tmp1), "=&r" (tmp2)
4628 : "r" (lock)
4629- : "memory");
4630+ : "memory", "cc");
4631 }
4632
4633-static int inline arch_read_trylock(raw_rwlock_t *lock)
4634+static inline int arch_read_trylock(raw_rwlock_t *lock)
4635 {
4636 int tmp1, tmp2;
4637
4638@@ -123,7 +128,12 @@ static int inline arch_read_trylock(raw_rwlock_t *lock)
4639 "1: ldsw [%2], %0\n"
4640 " brlz,a,pn %0, 2f\n"
4641 " mov 0, %0\n"
4642-" add %0, 1, %1\n"
4643+" addcc %0, 1, %1\n"
4644+
4645+#ifdef CONFIG_PAX_REFCOUNT
4646+" tvs %%icc, 6\n"
4647+#endif
4648+
4649 " cas [%2], %0, %1\n"
4650 " cmp %0, %1\n"
4651 " bne,pn %%icc, 1b\n"
4652@@ -136,13 +146,18 @@ static int inline arch_read_trylock(raw_rwlock_t *lock)
4653 return tmp1;
4654 }
4655
4656-static void inline arch_read_unlock(raw_rwlock_t *lock)
4657+static inline void arch_read_unlock(raw_rwlock_t *lock)
4658 {
4659 unsigned long tmp1, tmp2;
4660
4661 __asm__ __volatile__(
4662 "1: lduw [%2], %0\n"
4663-" sub %0, 1, %1\n"
4664+" subcc %0, 1, %1\n"
4665+
4666+#ifdef CONFIG_PAX_REFCOUNT
4667+" tvs %%icc, 6\n"
4668+#endif
4669+
4670 " cas [%2], %0, %1\n"
4671 " cmp %0, %1\n"
4672 " bne,pn %%xcc, 1b\n"
4673@@ -152,7 +167,7 @@ static void inline arch_read_unlock(raw_rwlock_t *lock)
4674 : "memory");
4675 }
4676
4677-static void inline arch_write_lock(raw_rwlock_t *lock)
4678+static inline void arch_write_lock(raw_rwlock_t *lock)
4679 {
4680 unsigned long mask, tmp1, tmp2;
4681
4682@@ -177,7 +192,7 @@ static void inline arch_write_lock(raw_rwlock_t *lock)
4683 : "memory");
4684 }
4685
4686-static void inline arch_write_unlock(raw_rwlock_t *lock)
4687+static inline void arch_write_unlock(raw_rwlock_t *lock)
4688 {
4689 __asm__ __volatile__(
4690 " stw %%g0, [%0]"
4691@@ -186,7 +201,7 @@ static void inline arch_write_unlock(raw_rwlock_t *lock)
4692 : "memory");
4693 }
4694
4695-static int inline arch_write_trylock(raw_rwlock_t *lock)
4696+static inline int arch_write_trylock(raw_rwlock_t *lock)
4697 {
4698 unsigned long mask, tmp1, tmp2, result;
4699
4700diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
4701index 844d73a..f787fb9 100644
4702--- a/arch/sparc/include/asm/thread_info_32.h
4703+++ b/arch/sparc/include/asm/thread_info_32.h
4704@@ -50,6 +50,8 @@ struct thread_info {
4705 unsigned long w_saved;
4706
4707 struct restart_block restart_block;
4708+
4709+ unsigned long lowest_stack;
4710 };
4711
4712 /*
4713diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
4714index f78ad9a..9f55fc7 100644
4715--- a/arch/sparc/include/asm/thread_info_64.h
4716+++ b/arch/sparc/include/asm/thread_info_64.h
4717@@ -68,6 +68,8 @@ struct thread_info {
4718 struct pt_regs *kern_una_regs;
4719 unsigned int kern_una_insn;
4720
4721+ unsigned long lowest_stack;
4722+
4723 unsigned long fpregs[0] __attribute__ ((aligned(64)));
4724 };
4725
4726diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
4727index e88fbe5..96b0ce5 100644
4728--- a/arch/sparc/include/asm/uaccess.h
4729+++ b/arch/sparc/include/asm/uaccess.h
4730@@ -1,5 +1,13 @@
4731 #ifndef ___ASM_SPARC_UACCESS_H
4732 #define ___ASM_SPARC_UACCESS_H
4733+
4734+#ifdef __KERNEL__
4735+#ifndef __ASSEMBLY__
4736+#include <linux/types.h>
4737+extern void check_object_size(const void *ptr, unsigned long n, bool to);
4738+#endif
4739+#endif
4740+
4741 #if defined(__sparc__) && defined(__arch64__)
4742 #include <asm/uaccess_64.h>
4743 #else
4744diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
4745index 8303ac4..07f333d 100644
4746--- a/arch/sparc/include/asm/uaccess_32.h
4747+++ b/arch/sparc/include/asm/uaccess_32.h
4748@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
4749
4750 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
4751 {
4752- if (n && __access_ok((unsigned long) to, n))
4753+ if ((long)n < 0)
4754+ return n;
4755+
4756+ if (n && __access_ok((unsigned long) to, n)) {
4757+ if (!__builtin_constant_p(n))
4758+ check_object_size(from, n, true);
4759 return __copy_user(to, (__force void __user *) from, n);
4760- else
4761+ } else
4762 return n;
4763 }
4764
4765 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
4766 {
4767+ if ((long)n < 0)
4768+ return n;
4769+
4770+ if (!__builtin_constant_p(n))
4771+ check_object_size(from, n, true);
4772+
4773 return __copy_user(to, (__force void __user *) from, n);
4774 }
4775
4776 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
4777 {
4778- if (n && __access_ok((unsigned long) from, n))
4779+ if ((long)n < 0)
4780+ return n;
4781+
4782+ if (n && __access_ok((unsigned long) from, n)) {
4783+ if (!__builtin_constant_p(n))
4784+ check_object_size(to, n, false);
4785 return __copy_user((__force void __user *) to, from, n);
4786- else
4787+ } else
4788 return n;
4789 }
4790
4791 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
4792 {
4793+ if ((long)n < 0)
4794+ return n;
4795+
4796 return __copy_user((__force void __user *) to, from, n);
4797 }
4798
4799diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
4800index 9ea271e..7b8a271 100644
4801--- a/arch/sparc/include/asm/uaccess_64.h
4802+++ b/arch/sparc/include/asm/uaccess_64.h
4803@@ -9,6 +9,7 @@
4804 #include <linux/compiler.h>
4805 #include <linux/string.h>
4806 #include <linux/thread_info.h>
4807+#include <linux/kernel.h>
4808 #include <asm/asi.h>
4809 #include <asm/system.h>
4810 #include <asm/spitfire.h>
4811@@ -212,8 +213,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
4812 static inline unsigned long __must_check
4813 copy_from_user(void *to, const void __user *from, unsigned long size)
4814 {
4815- unsigned long ret = ___copy_from_user(to, from, size);
4816+ unsigned long ret;
4817
4818+ if ((long)size < 0 || size > INT_MAX)
4819+ return size;
4820+
4821+ if (!__builtin_constant_p(size))
4822+ check_object_size(to, size, false);
4823+
4824+ ret = ___copy_from_user(to, from, size);
4825 if (unlikely(ret))
4826 ret = copy_from_user_fixup(to, from, size);
4827 return ret;
4828@@ -228,8 +236,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
4829 static inline unsigned long __must_check
4830 copy_to_user(void __user *to, const void *from, unsigned long size)
4831 {
4832- unsigned long ret = ___copy_to_user(to, from, size);
4833+ unsigned long ret;
4834
4835+ if ((long)size < 0 || size > INT_MAX)
4836+ return size;
4837+
4838+ if (!__builtin_constant_p(size))
4839+ check_object_size(from, size, true);
4840+
4841+ ret = ___copy_to_user(to, from, size);
4842 if (unlikely(ret))
4843 ret = copy_to_user_fixup(to, from, size);
4844 return ret;
4845diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
4846index 2782681..77ded84 100644
4847--- a/arch/sparc/kernel/Makefile
4848+++ b/arch/sparc/kernel/Makefile
4849@@ -3,7 +3,7 @@
4850 #
4851
4852 asflags-y := -ansi
4853-ccflags-y := -Werror
4854+#ccflags-y := -Werror
4855
4856 extra-y := head_$(BITS).o
4857 extra-y += init_task.o
4858diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
4859index 7690cc2..ece64c9 100644
4860--- a/arch/sparc/kernel/iommu.c
4861+++ b/arch/sparc/kernel/iommu.c
4862@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev,
4863 spin_unlock_irqrestore(&iommu->lock, flags);
4864 }
4865
4866-static struct dma_map_ops sun4u_dma_ops = {
4867+static const struct dma_map_ops sun4u_dma_ops = {
4868 .alloc_coherent = dma_4u_alloc_coherent,
4869 .free_coherent = dma_4u_free_coherent,
4870 .map_page = dma_4u_map_page,
4871@@ -837,7 +837,7 @@ static struct dma_map_ops sun4u_dma_ops = {
4872 .sync_sg_for_cpu = dma_4u_sync_sg_for_cpu,
4873 };
4874
4875-struct dma_map_ops *dma_ops = &sun4u_dma_ops;
4876+const struct dma_map_ops *dma_ops = &sun4u_dma_ops;
4877 EXPORT_SYMBOL(dma_ops);
4878
4879 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
4880diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
4881index 9f61fd8..bd048db 100644
4882--- a/arch/sparc/kernel/ioport.c
4883+++ b/arch/sparc/kernel/ioport.c
4884@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
4885 BUG();
4886 }
4887
4888-struct dma_map_ops sbus_dma_ops = {
4889+const struct dma_map_ops sbus_dma_ops = {
4890 .alloc_coherent = sbus_alloc_coherent,
4891 .free_coherent = sbus_free_coherent,
4892 .map_page = sbus_map_page,
4893@@ -403,7 +403,7 @@ struct dma_map_ops sbus_dma_ops = {
4894 .sync_sg_for_device = sbus_sync_sg_for_device,
4895 };
4896
4897-struct dma_map_ops *dma_ops = &sbus_dma_ops;
4898+const struct dma_map_ops *dma_ops = &sbus_dma_ops;
4899 EXPORT_SYMBOL(dma_ops);
4900
4901 static int __init sparc_register_ioport(void)
4902@@ -640,7 +640,7 @@ static void pci32_sync_sg_for_device(struct device *device, struct scatterlist *
4903 }
4904 }
4905
4906-struct dma_map_ops pci32_dma_ops = {
4907+const struct dma_map_ops pci32_dma_ops = {
4908 .alloc_coherent = pci32_alloc_coherent,
4909 .free_coherent = pci32_free_coherent,
4910 .map_page = pci32_map_page,
4911diff --git a/arch/sparc/kernel/kgdb_32.c b/arch/sparc/kernel/kgdb_32.c
4912index 04df4ed..55c4b6e 100644
4913--- a/arch/sparc/kernel/kgdb_32.c
4914+++ b/arch/sparc/kernel/kgdb_32.c
4915@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
4916 {
4917 }
4918
4919-struct kgdb_arch arch_kgdb_ops = {
4920+const struct kgdb_arch arch_kgdb_ops = {
4921 /* Breakpoint instruction: ta 0x7d */
4922 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
4923 };
4924diff --git a/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c
4925index f5a0fd4..d886f71 100644
4926--- a/arch/sparc/kernel/kgdb_64.c
4927+++ b/arch/sparc/kernel/kgdb_64.c
4928@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
4929 {
4930 }
4931
4932-struct kgdb_arch arch_kgdb_ops = {
4933+const struct kgdb_arch arch_kgdb_ops = {
4934 /* Breakpoint instruction: ta 0x72 */
4935 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
4936 };
4937diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
4938index 23c33ff..d137fbd 100644
4939--- a/arch/sparc/kernel/pci_sun4v.c
4940+++ b/arch/sparc/kernel/pci_sun4v.c
4941@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,
4942 spin_unlock_irqrestore(&iommu->lock, flags);
4943 }
4944
4945-static struct dma_map_ops sun4v_dma_ops = {
4946+static const struct dma_map_ops sun4v_dma_ops = {
4947 .alloc_coherent = dma_4v_alloc_coherent,
4948 .free_coherent = dma_4v_free_coherent,
4949 .map_page = dma_4v_map_page,
4950diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
4951index c49865b..b41a81b 100644
4952--- a/arch/sparc/kernel/process_32.c
4953+++ b/arch/sparc/kernel/process_32.c
4954@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
4955 rw->ins[4], rw->ins[5],
4956 rw->ins[6],
4957 rw->ins[7]);
4958- printk("%pS\n", (void *) rw->ins[7]);
4959+ printk("%pA\n", (void *) rw->ins[7]);
4960 rw = (struct reg_window32 *) rw->ins[6];
4961 }
4962 spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
4963@@ -263,14 +263,14 @@ void show_regs(struct pt_regs *r)
4964
4965 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
4966 r->psr, r->pc, r->npc, r->y, print_tainted());
4967- printk("PC: <%pS>\n", (void *) r->pc);
4968+ printk("PC: <%pA>\n", (void *) r->pc);
4969 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
4970 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
4971 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
4972 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
4973 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
4974 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
4975- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
4976+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
4977
4978 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
4979 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
4980@@ -305,7 +305,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
4981 rw = (struct reg_window32 *) fp;
4982 pc = rw->ins[7];
4983 printk("[%08lx : ", pc);
4984- printk("%pS ] ", (void *) pc);
4985+ printk("%pA ] ", (void *) pc);
4986 fp = rw->ins[6];
4987 } while (++count < 16);
4988 printk("\n");
4989diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
4990index cb70476..3d0c191 100644
4991--- a/arch/sparc/kernel/process_64.c
4992+++ b/arch/sparc/kernel/process_64.c
4993@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_regs *regs)
4994 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
4995 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
4996 if (regs->tstate & TSTATE_PRIV)
4997- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
4998+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
4999 }
5000
5001 void show_regs(struct pt_regs *regs)
5002 {
5003 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
5004 regs->tpc, regs->tnpc, regs->y, print_tainted());
5005- printk("TPC: <%pS>\n", (void *) regs->tpc);
5006+ printk("TPC: <%pA>\n", (void *) regs->tpc);
5007 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
5008 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
5009 regs->u_regs[3]);
5010@@ -200,7 +200,7 @@ void show_regs(struct pt_regs *regs)
5011 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
5012 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
5013 regs->u_regs[15]);
5014- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
5015+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
5016 show_regwindow(regs);
5017 }
5018
5019@@ -284,7 +284,7 @@ void arch_trigger_all_cpu_backtrace(void)
5020 ((tp && tp->task) ? tp->task->pid : -1));
5021
5022 if (gp->tstate & TSTATE_PRIV) {
5023- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
5024+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
5025 (void *) gp->tpc,
5026 (void *) gp->o7,
5027 (void *) gp->i7,
5028diff --git a/arch/sparc/kernel/sigutil_64.c b/arch/sparc/kernel/sigutil_64.c
5029index 6edc4e5..06a69b4 100644
5030--- a/arch/sparc/kernel/sigutil_64.c
5031+++ b/arch/sparc/kernel/sigutil_64.c
5032@@ -2,6 +2,7 @@
5033 #include <linux/types.h>
5034 #include <linux/thread_info.h>
5035 #include <linux/uaccess.h>
5036+#include <linux/errno.h>
5037
5038 #include <asm/sigcontext.h>
5039 #include <asm/fpumacro.h>
5040diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
5041index 3a82e65..ce0a53a 100644
5042--- a/arch/sparc/kernel/sys_sparc_32.c
5043+++ b/arch/sparc/kernel/sys_sparc_32.c
5044@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5045 if (ARCH_SUN4C && len > 0x20000000)
5046 return -ENOMEM;
5047 if (!addr)
5048- addr = TASK_UNMAPPED_BASE;
5049+ addr = current->mm->mmap_base;
5050
5051 if (flags & MAP_SHARED)
5052 addr = COLOUR_ALIGN(addr);
5053@@ -72,7 +72,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5054 }
5055 if (TASK_SIZE - PAGE_SIZE - len < addr)
5056 return -ENOMEM;
5057- if (!vmm || addr + len <= vmm->vm_start)
5058+ if (check_heap_stack_gap(vmm, addr, len))
5059 return addr;
5060 addr = vmm->vm_end;
5061 if (flags & MAP_SHARED)
5062diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
5063index cfa0e19..98972ac 100644
5064--- a/arch/sparc/kernel/sys_sparc_64.c
5065+++ b/arch/sparc/kernel/sys_sparc_64.c
5066@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5067 /* We do not accept a shared mapping if it would violate
5068 * cache aliasing constraints.
5069 */
5070- if ((flags & MAP_SHARED) &&
5071+ if ((filp || (flags & MAP_SHARED)) &&
5072 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5073 return -EINVAL;
5074 return addr;
5075@@ -140,6 +140,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5076 if (filp || (flags & MAP_SHARED))
5077 do_color_align = 1;
5078
5079+#ifdef CONFIG_PAX_RANDMMAP
5080+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
5081+#endif
5082+
5083 if (addr) {
5084 if (do_color_align)
5085 addr = COLOUR_ALIGN(addr, pgoff);
5086@@ -147,15 +151,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5087 addr = PAGE_ALIGN(addr);
5088
5089 vma = find_vma(mm, addr);
5090- if (task_size - len >= addr &&
5091- (!vma || addr + len <= vma->vm_start))
5092+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5093 return addr;
5094 }
5095
5096 if (len > mm->cached_hole_size) {
5097- start_addr = addr = mm->free_area_cache;
5098+ start_addr = addr = mm->free_area_cache;
5099 } else {
5100- start_addr = addr = TASK_UNMAPPED_BASE;
5101+ start_addr = addr = mm->mmap_base;
5102 mm->cached_hole_size = 0;
5103 }
5104
5105@@ -175,14 +178,14 @@ full_search:
5106 vma = find_vma(mm, VA_EXCLUDE_END);
5107 }
5108 if (unlikely(task_size < addr)) {
5109- if (start_addr != TASK_UNMAPPED_BASE) {
5110- start_addr = addr = TASK_UNMAPPED_BASE;
5111+ if (start_addr != mm->mmap_base) {
5112+ start_addr = addr = mm->mmap_base;
5113 mm->cached_hole_size = 0;
5114 goto full_search;
5115 }
5116 return -ENOMEM;
5117 }
5118- if (likely(!vma || addr + len <= vma->vm_start)) {
5119+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5120 /*
5121 * Remember the place where we stopped the search:
5122 */
5123@@ -216,7 +219,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5124 /* We do not accept a shared mapping if it would violate
5125 * cache aliasing constraints.
5126 */
5127- if ((flags & MAP_SHARED) &&
5128+ if ((filp || (flags & MAP_SHARED)) &&
5129 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5130 return -EINVAL;
5131 return addr;
5132@@ -237,8 +240,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5133 addr = PAGE_ALIGN(addr);
5134
5135 vma = find_vma(mm, addr);
5136- if (task_size - len >= addr &&
5137- (!vma || addr + len <= vma->vm_start))
5138+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5139 return addr;
5140 }
5141
5142@@ -259,7 +261,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5143 /* make sure it can fit in the remaining address space */
5144 if (likely(addr > len)) {
5145 vma = find_vma(mm, addr-len);
5146- if (!vma || addr <= vma->vm_start) {
5147+ if (check_heap_stack_gap(vma, addr - len, len)) {
5148 /* remember the address as a hint for next time */
5149 return (mm->free_area_cache = addr-len);
5150 }
5151@@ -268,18 +270,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5152 if (unlikely(mm->mmap_base < len))
5153 goto bottomup;
5154
5155- addr = mm->mmap_base-len;
5156- if (do_color_align)
5157- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5158+ addr = mm->mmap_base - len;
5159
5160 do {
5161+ if (do_color_align)
5162+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5163 /*
5164 * Lookup failure means no vma is above this address,
5165 * else if new region fits below vma->vm_start,
5166 * return with success:
5167 */
5168 vma = find_vma(mm, addr);
5169- if (likely(!vma || addr+len <= vma->vm_start)) {
5170+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5171 /* remember the address as a hint for next time */
5172 return (mm->free_area_cache = addr);
5173 }
5174@@ -289,10 +291,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5175 mm->cached_hole_size = vma->vm_start - addr;
5176
5177 /* try just below the current vma->vm_start */
5178- addr = vma->vm_start-len;
5179- if (do_color_align)
5180- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5181- } while (likely(len < vma->vm_start));
5182+ addr = skip_heap_stack_gap(vma, len);
5183+ } while (!IS_ERR_VALUE(addr));
5184
5185 bottomup:
5186 /*
5187@@ -384,6 +384,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5188 current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY ||
5189 sysctl_legacy_va_layout) {
5190 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
5191+
5192+#ifdef CONFIG_PAX_RANDMMAP
5193+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5194+ mm->mmap_base += mm->delta_mmap;
5195+#endif
5196+
5197 mm->get_unmapped_area = arch_get_unmapped_area;
5198 mm->unmap_area = arch_unmap_area;
5199 } else {
5200@@ -398,6 +404,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5201 gap = (task_size / 6 * 5);
5202
5203 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
5204+
5205+#ifdef CONFIG_PAX_RANDMMAP
5206+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5207+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
5208+#endif
5209+
5210 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
5211 mm->unmap_area = arch_unmap_area_topdown;
5212 }
5213diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
5214index c0490c7..84959d1 100644
5215--- a/arch/sparc/kernel/traps_32.c
5216+++ b/arch/sparc/kernel/traps_32.c
5217@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
5218 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
5219 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
5220
5221+extern void gr_handle_kernel_exploit(void);
5222+
5223 void die_if_kernel(char *str, struct pt_regs *regs)
5224 {
5225 static int die_counter;
5226@@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5227 count++ < 30 &&
5228 (((unsigned long) rw) >= PAGE_OFFSET) &&
5229 !(((unsigned long) rw) & 0x7)) {
5230- printk("Caller[%08lx]: %pS\n", rw->ins[7],
5231+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
5232 (void *) rw->ins[7]);
5233 rw = (struct reg_window32 *)rw->ins[6];
5234 }
5235 }
5236 printk("Instruction DUMP:");
5237 instruction_dump ((unsigned long *) regs->pc);
5238- if(regs->psr & PSR_PS)
5239+ if(regs->psr & PSR_PS) {
5240+ gr_handle_kernel_exploit();
5241 do_exit(SIGKILL);
5242+ }
5243 do_exit(SIGSEGV);
5244 }
5245
5246diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
5247index 10f7bb9..cdb6793 100644
5248--- a/arch/sparc/kernel/traps_64.c
5249+++ b/arch/sparc/kernel/traps_64.c
5250@@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
5251 i + 1,
5252 p->trapstack[i].tstate, p->trapstack[i].tpc,
5253 p->trapstack[i].tnpc, p->trapstack[i].tt);
5254- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
5255+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
5256 }
5257 }
5258
5259@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
5260
5261 lvl -= 0x100;
5262 if (regs->tstate & TSTATE_PRIV) {
5263+
5264+#ifdef CONFIG_PAX_REFCOUNT
5265+ if (lvl == 6)
5266+ pax_report_refcount_overflow(regs);
5267+#endif
5268+
5269 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
5270 die_if_kernel(buffer, regs);
5271 }
5272@@ -111,11 +117,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
5273 void bad_trap_tl1(struct pt_regs *regs, long lvl)
5274 {
5275 char buffer[32];
5276-
5277+
5278 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
5279 0, lvl, SIGTRAP) == NOTIFY_STOP)
5280 return;
5281
5282+#ifdef CONFIG_PAX_REFCOUNT
5283+ if (lvl == 6)
5284+ pax_report_refcount_overflow(regs);
5285+#endif
5286+
5287 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
5288
5289 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
5290@@ -1139,7 +1150,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
5291 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
5292 printk("%s" "ERROR(%d): ",
5293 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
5294- printk("TPC<%pS>\n", (void *) regs->tpc);
5295+ printk("TPC<%pA>\n", (void *) regs->tpc);
5296 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
5297 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
5298 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
5299@@ -1746,7 +1757,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5300 smp_processor_id(),
5301 (type & 0x1) ? 'I' : 'D',
5302 regs->tpc);
5303- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
5304+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
5305 panic("Irrecoverable Cheetah+ parity error.");
5306 }
5307
5308@@ -1754,7 +1765,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5309 smp_processor_id(),
5310 (type & 0x1) ? 'I' : 'D',
5311 regs->tpc);
5312- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
5313+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
5314 }
5315
5316 struct sun4v_error_entry {
5317@@ -1961,9 +1972,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
5318
5319 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
5320 regs->tpc, tl);
5321- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
5322+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
5323 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5324- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
5325+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
5326 (void *) regs->u_regs[UREG_I7]);
5327 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
5328 "pte[%lx] error[%lx]\n",
5329@@ -1985,9 +1996,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
5330
5331 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
5332 regs->tpc, tl);
5333- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
5334+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
5335 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5336- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
5337+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
5338 (void *) regs->u_regs[UREG_I7]);
5339 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
5340 "pte[%lx] error[%lx]\n",
5341@@ -2191,7 +2202,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5342 fp = (unsigned long)sf->fp + STACK_BIAS;
5343 }
5344
5345- printk(" [%016lx] %pS\n", pc, (void *) pc);
5346+ printk(" [%016lx] %pA\n", pc, (void *) pc);
5347 } while (++count < 16);
5348 }
5349
5350@@ -2233,6 +2244,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
5351 return (struct reg_window *) (fp + STACK_BIAS);
5352 }
5353
5354+extern void gr_handle_kernel_exploit(void);
5355+
5356 void die_if_kernel(char *str, struct pt_regs *regs)
5357 {
5358 static int die_counter;
5359@@ -2260,7 +2273,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5360 while (rw &&
5361 count++ < 30&&
5362 is_kernel_stack(current, rw)) {
5363- printk("Caller[%016lx]: %pS\n", rw->ins[7],
5364+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
5365 (void *) rw->ins[7]);
5366
5367 rw = kernel_stack_up(rw);
5368@@ -2273,8 +2286,11 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5369 }
5370 user_instruction_dump ((unsigned int __user *) regs->tpc);
5371 }
5372- if (regs->tstate & TSTATE_PRIV)
5373+ if (regs->tstate & TSTATE_PRIV) {
5374+ gr_handle_kernel_exploit();
5375 do_exit(SIGKILL);
5376+ }
5377+
5378 do_exit(SIGSEGV);
5379 }
5380 EXPORT_SYMBOL(die_if_kernel);
5381diff --git a/arch/sparc/kernel/una_asm_64.S b/arch/sparc/kernel/una_asm_64.S
5382index be183fe..1c8d332 100644
5383--- a/arch/sparc/kernel/una_asm_64.S
5384+++ b/arch/sparc/kernel/una_asm_64.S
5385@@ -127,7 +127,7 @@ do_int_load:
5386 wr %o5, 0x0, %asi
5387 retl
5388 mov 0, %o0
5389- .size __do_int_load, .-__do_int_load
5390+ .size do_int_load, .-do_int_load
5391
5392 .section __ex_table,"a"
5393 .word 4b, __retl_efault
5394diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
5395index 3792099..2af17d8 100644
5396--- a/arch/sparc/kernel/unaligned_64.c
5397+++ b/arch/sparc/kernel/unaligned_64.c
5398@@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs *regs)
5399 if (count < 5) {
5400 last_time = jiffies;
5401 count++;
5402- printk("Kernel unaligned access at TPC[%lx] %pS\n",
5403+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
5404 regs->tpc, (void *) regs->tpc);
5405 }
5406 }
5407diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
5408index e75faf0..24f12f9 100644
5409--- a/arch/sparc/lib/Makefile
5410+++ b/arch/sparc/lib/Makefile
5411@@ -2,7 +2,7 @@
5412 #
5413
5414 asflags-y := -ansi -DST_DIV0=0x02
5415-ccflags-y := -Werror
5416+#ccflags-y := -Werror
5417
5418 lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
5419 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
5420diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
5421index 0268210..f0291ca 100644
5422--- a/arch/sparc/lib/atomic_64.S
5423+++ b/arch/sparc/lib/atomic_64.S
5424@@ -18,7 +18,12 @@
5425 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5426 BACKOFF_SETUP(%o2)
5427 1: lduw [%o1], %g1
5428- add %g1, %o0, %g7
5429+ addcc %g1, %o0, %g7
5430+
5431+#ifdef CONFIG_PAX_REFCOUNT
5432+ tvs %icc, 6
5433+#endif
5434+
5435 cas [%o1], %g1, %g7
5436 cmp %g1, %g7
5437 bne,pn %icc, 2f
5438@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5439 2: BACKOFF_SPIN(%o2, %o3, 1b)
5440 .size atomic_add, .-atomic_add
5441
5442+ .globl atomic_add_unchecked
5443+ .type atomic_add_unchecked,#function
5444+atomic_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5445+ BACKOFF_SETUP(%o2)
5446+1: lduw [%o1], %g1
5447+ add %g1, %o0, %g7
5448+ cas [%o1], %g1, %g7
5449+ cmp %g1, %g7
5450+ bne,pn %icc, 2f
5451+ nop
5452+ retl
5453+ nop
5454+2: BACKOFF_SPIN(%o2, %o3, 1b)
5455+ .size atomic_add_unchecked, .-atomic_add_unchecked
5456+
5457 .globl atomic_sub
5458 .type atomic_sub,#function
5459 atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5460 BACKOFF_SETUP(%o2)
5461 1: lduw [%o1], %g1
5462- sub %g1, %o0, %g7
5463+ subcc %g1, %o0, %g7
5464+
5465+#ifdef CONFIG_PAX_REFCOUNT
5466+ tvs %icc, 6
5467+#endif
5468+
5469 cas [%o1], %g1, %g7
5470 cmp %g1, %g7
5471 bne,pn %icc, 2f
5472@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5473 2: BACKOFF_SPIN(%o2, %o3, 1b)
5474 .size atomic_sub, .-atomic_sub
5475
5476+ .globl atomic_sub_unchecked
5477+ .type atomic_sub_unchecked,#function
5478+atomic_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5479+ BACKOFF_SETUP(%o2)
5480+1: lduw [%o1], %g1
5481+ sub %g1, %o0, %g7
5482+ cas [%o1], %g1, %g7
5483+ cmp %g1, %g7
5484+ bne,pn %icc, 2f
5485+ nop
5486+ retl
5487+ nop
5488+2: BACKOFF_SPIN(%o2, %o3, 1b)
5489+ .size atomic_sub_unchecked, .-atomic_sub_unchecked
5490+
5491 .globl atomic_add_ret
5492 .type atomic_add_ret,#function
5493 atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5494 BACKOFF_SETUP(%o2)
5495 1: lduw [%o1], %g1
5496- add %g1, %o0, %g7
5497+ addcc %g1, %o0, %g7
5498+
5499+#ifdef CONFIG_PAX_REFCOUNT
5500+ tvs %icc, 6
5501+#endif
5502+
5503 cas [%o1], %g1, %g7
5504 cmp %g1, %g7
5505 bne,pn %icc, 2f
5506@@ -59,12 +104,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5507 2: BACKOFF_SPIN(%o2, %o3, 1b)
5508 .size atomic_add_ret, .-atomic_add_ret
5509
5510+ .globl atomic_add_ret_unchecked
5511+ .type atomic_add_ret_unchecked,#function
5512+atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5513+ BACKOFF_SETUP(%o2)
5514+1: lduw [%o1], %g1
5515+ addcc %g1, %o0, %g7
5516+ cas [%o1], %g1, %g7
5517+ cmp %g1, %g7
5518+ bne,pn %icc, 2f
5519+ add %g7, %o0, %g7
5520+ sra %g7, 0, %o0
5521+ retl
5522+ nop
5523+2: BACKOFF_SPIN(%o2, %o3, 1b)
5524+ .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked
5525+
5526 .globl atomic_sub_ret
5527 .type atomic_sub_ret,#function
5528 atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5529 BACKOFF_SETUP(%o2)
5530 1: lduw [%o1], %g1
5531- sub %g1, %o0, %g7
5532+ subcc %g1, %o0, %g7
5533+
5534+#ifdef CONFIG_PAX_REFCOUNT
5535+ tvs %icc, 6
5536+#endif
5537+
5538 cas [%o1], %g1, %g7
5539 cmp %g1, %g7
5540 bne,pn %icc, 2f
5541@@ -80,7 +146,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5542 atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5543 BACKOFF_SETUP(%o2)
5544 1: ldx [%o1], %g1
5545- add %g1, %o0, %g7
5546+ addcc %g1, %o0, %g7
5547+
5548+#ifdef CONFIG_PAX_REFCOUNT
5549+ tvs %xcc, 6
5550+#endif
5551+
5552 casx [%o1], %g1, %g7
5553 cmp %g1, %g7
5554 bne,pn %xcc, 2f
5555@@ -90,12 +161,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5556 2: BACKOFF_SPIN(%o2, %o3, 1b)
5557 .size atomic64_add, .-atomic64_add
5558
5559+ .globl atomic64_add_unchecked
5560+ .type atomic64_add_unchecked,#function
5561+atomic64_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5562+ BACKOFF_SETUP(%o2)
5563+1: ldx [%o1], %g1
5564+ addcc %g1, %o0, %g7
5565+ casx [%o1], %g1, %g7
5566+ cmp %g1, %g7
5567+ bne,pn %xcc, 2f
5568+ nop
5569+ retl
5570+ nop
5571+2: BACKOFF_SPIN(%o2, %o3, 1b)
5572+ .size atomic64_add_unchecked, .-atomic64_add_unchecked
5573+
5574 .globl atomic64_sub
5575 .type atomic64_sub,#function
5576 atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5577 BACKOFF_SETUP(%o2)
5578 1: ldx [%o1], %g1
5579- sub %g1, %o0, %g7
5580+ subcc %g1, %o0, %g7
5581+
5582+#ifdef CONFIG_PAX_REFCOUNT
5583+ tvs %xcc, 6
5584+#endif
5585+
5586 casx [%o1], %g1, %g7
5587 cmp %g1, %g7
5588 bne,pn %xcc, 2f
5589@@ -105,12 +196,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5590 2: BACKOFF_SPIN(%o2, %o3, 1b)
5591 .size atomic64_sub, .-atomic64_sub
5592
5593+ .globl atomic64_sub_unchecked
5594+ .type atomic64_sub_unchecked,#function
5595+atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5596+ BACKOFF_SETUP(%o2)
5597+1: ldx [%o1], %g1
5598+ subcc %g1, %o0, %g7
5599+ casx [%o1], %g1, %g7
5600+ cmp %g1, %g7
5601+ bne,pn %xcc, 2f
5602+ nop
5603+ retl
5604+ nop
5605+2: BACKOFF_SPIN(%o2, %o3, 1b)
5606+ .size atomic64_sub_unchecked, .-atomic64_sub_unchecked
5607+
5608 .globl atomic64_add_ret
5609 .type atomic64_add_ret,#function
5610 atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5611 BACKOFF_SETUP(%o2)
5612 1: ldx [%o1], %g1
5613- add %g1, %o0, %g7
5614+ addcc %g1, %o0, %g7
5615+
5616+#ifdef CONFIG_PAX_REFCOUNT
5617+ tvs %xcc, 6
5618+#endif
5619+
5620 casx [%o1], %g1, %g7
5621 cmp %g1, %g7
5622 bne,pn %xcc, 2f
5623@@ -121,12 +232,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5624 2: BACKOFF_SPIN(%o2, %o3, 1b)
5625 .size atomic64_add_ret, .-atomic64_add_ret
5626
5627+ .globl atomic64_add_ret_unchecked
5628+ .type atomic64_add_ret_unchecked,#function
5629+atomic64_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5630+ BACKOFF_SETUP(%o2)
5631+1: ldx [%o1], %g1
5632+ addcc %g1, %o0, %g7
5633+ casx [%o1], %g1, %g7
5634+ cmp %g1, %g7
5635+ bne,pn %xcc, 2f
5636+ add %g7, %o0, %g7
5637+ mov %g7, %o0
5638+ retl
5639+ nop
5640+2: BACKOFF_SPIN(%o2, %o3, 1b)
5641+ .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked
5642+
5643 .globl atomic64_sub_ret
5644 .type atomic64_sub_ret,#function
5645 atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5646 BACKOFF_SETUP(%o2)
5647 1: ldx [%o1], %g1
5648- sub %g1, %o0, %g7
5649+ subcc %g1, %o0, %g7
5650+
5651+#ifdef CONFIG_PAX_REFCOUNT
5652+ tvs %xcc, 6
5653+#endif
5654+
5655 casx [%o1], %g1, %g7
5656 cmp %g1, %g7
5657 bne,pn %xcc, 2f
5658diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
5659index 704b126..2e79d76 100644
5660--- a/arch/sparc/lib/ksyms.c
5661+++ b/arch/sparc/lib/ksyms.c
5662@@ -144,12 +144,18 @@ EXPORT_SYMBOL(__downgrade_write);
5663
5664 /* Atomic counter implementation. */
5665 EXPORT_SYMBOL(atomic_add);
5666+EXPORT_SYMBOL(atomic_add_unchecked);
5667 EXPORT_SYMBOL(atomic_add_ret);
5668+EXPORT_SYMBOL(atomic_add_ret_unchecked);
5669 EXPORT_SYMBOL(atomic_sub);
5670+EXPORT_SYMBOL(atomic_sub_unchecked);
5671 EXPORT_SYMBOL(atomic_sub_ret);
5672 EXPORT_SYMBOL(atomic64_add);
5673+EXPORT_SYMBOL(atomic64_add_unchecked);
5674 EXPORT_SYMBOL(atomic64_add_ret);
5675+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
5676 EXPORT_SYMBOL(atomic64_sub);
5677+EXPORT_SYMBOL(atomic64_sub_unchecked);
5678 EXPORT_SYMBOL(atomic64_sub_ret);
5679
5680 /* Atomic bit operations. */
5681diff --git a/arch/sparc/lib/rwsem_64.S b/arch/sparc/lib/rwsem_64.S
5682index 91a7d29..ce75c29 100644
5683--- a/arch/sparc/lib/rwsem_64.S
5684+++ b/arch/sparc/lib/rwsem_64.S
5685@@ -11,7 +11,12 @@
5686 .globl __down_read
5687 __down_read:
5688 1: lduw [%o0], %g1
5689- add %g1, 1, %g7
5690+ addcc %g1, 1, %g7
5691+
5692+#ifdef CONFIG_PAX_REFCOUNT
5693+ tvs %icc, 6
5694+#endif
5695+
5696 cas [%o0], %g1, %g7
5697 cmp %g1, %g7
5698 bne,pn %icc, 1b
5699@@ -33,7 +38,12 @@ __down_read:
5700 .globl __down_read_trylock
5701 __down_read_trylock:
5702 1: lduw [%o0], %g1
5703- add %g1, 1, %g7
5704+ addcc %g1, 1, %g7
5705+
5706+#ifdef CONFIG_PAX_REFCOUNT
5707+ tvs %icc, 6
5708+#endif
5709+
5710 cmp %g7, 0
5711 bl,pn %icc, 2f
5712 mov 0, %o1
5713@@ -51,7 +61,12 @@ __down_write:
5714 or %g1, %lo(RWSEM_ACTIVE_WRITE_BIAS), %g1
5715 1:
5716 lduw [%o0], %g3
5717- add %g3, %g1, %g7
5718+ addcc %g3, %g1, %g7
5719+
5720+#ifdef CONFIG_PAX_REFCOUNT
5721+ tvs %icc, 6
5722+#endif
5723+
5724 cas [%o0], %g3, %g7
5725 cmp %g3, %g7
5726 bne,pn %icc, 1b
5727@@ -77,7 +92,12 @@ __down_write_trylock:
5728 cmp %g3, 0
5729 bne,pn %icc, 2f
5730 mov 0, %o1
5731- add %g3, %g1, %g7
5732+ addcc %g3, %g1, %g7
5733+
5734+#ifdef CONFIG_PAX_REFCOUNT
5735+ tvs %icc, 6
5736+#endif
5737+
5738 cas [%o0], %g3, %g7
5739 cmp %g3, %g7
5740 bne,pn %icc, 1b
5741@@ -90,7 +110,12 @@ __down_write_trylock:
5742 __up_read:
5743 1:
5744 lduw [%o0], %g1
5745- sub %g1, 1, %g7
5746+ subcc %g1, 1, %g7
5747+
5748+#ifdef CONFIG_PAX_REFCOUNT
5749+ tvs %icc, 6
5750+#endif
5751+
5752 cas [%o0], %g1, %g7
5753 cmp %g1, %g7
5754 bne,pn %icc, 1b
5755@@ -118,7 +143,12 @@ __up_write:
5756 or %g1, %lo(RWSEM_ACTIVE_WRITE_BIAS), %g1
5757 1:
5758 lduw [%o0], %g3
5759- sub %g3, %g1, %g7
5760+ subcc %g3, %g1, %g7
5761+
5762+#ifdef CONFIG_PAX_REFCOUNT
5763+ tvs %icc, 6
5764+#endif
5765+
5766 cas [%o0], %g3, %g7
5767 cmp %g3, %g7
5768 bne,pn %icc, 1b
5769@@ -143,7 +173,12 @@ __downgrade_write:
5770 or %g1, %lo(RWSEM_WAITING_BIAS), %g1
5771 1:
5772 lduw [%o0], %g3
5773- sub %g3, %g1, %g7
5774+ subcc %g3, %g1, %g7
5775+
5776+#ifdef CONFIG_PAX_REFCOUNT
5777+ tvs %icc, 6
5778+#endif
5779+
5780 cas [%o0], %g3, %g7
5781 cmp %g3, %g7
5782 bne,pn %icc, 1b
5783diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
5784index 79836a7..62f47a2 100644
5785--- a/arch/sparc/mm/Makefile
5786+++ b/arch/sparc/mm/Makefile
5787@@ -2,7 +2,7 @@
5788 #
5789
5790 asflags-y := -ansi
5791-ccflags-y := -Werror
5792+#ccflags-y := -Werror
5793
5794 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
5795 obj-y += fault_$(BITS).o
5796diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
5797index b99f81c..3453e93 100644
5798--- a/arch/sparc/mm/fault_32.c
5799+++ b/arch/sparc/mm/fault_32.c
5800@@ -21,6 +21,9 @@
5801 #include <linux/interrupt.h>
5802 #include <linux/module.h>
5803 #include <linux/kdebug.h>
5804+#include <linux/slab.h>
5805+#include <linux/pagemap.h>
5806+#include <linux/compiler.h>
5807
5808 #include <asm/system.h>
5809 #include <asm/page.h>
5810@@ -167,6 +170,267 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
5811 return safe_compute_effective_address(regs, insn);
5812 }
5813
5814+#ifdef CONFIG_PAX_PAGEEXEC
5815+#ifdef CONFIG_PAX_DLRESOLVE
5816+static void pax_emuplt_close(struct vm_area_struct *vma)
5817+{
5818+ vma->vm_mm->call_dl_resolve = 0UL;
5819+}
5820+
5821+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
5822+{
5823+ unsigned int *kaddr;
5824+
5825+ vmf->page = alloc_page(GFP_HIGHUSER);
5826+ if (!vmf->page)
5827+ return VM_FAULT_OOM;
5828+
5829+ kaddr = kmap(vmf->page);
5830+ memset(kaddr, 0, PAGE_SIZE);
5831+ kaddr[0] = 0x9DE3BFA8U; /* save */
5832+ flush_dcache_page(vmf->page);
5833+ kunmap(vmf->page);
5834+ return VM_FAULT_MAJOR;
5835+}
5836+
5837+static const struct vm_operations_struct pax_vm_ops = {
5838+ .close = pax_emuplt_close,
5839+ .fault = pax_emuplt_fault
5840+};
5841+
5842+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
5843+{
5844+ int ret;
5845+
5846+ vma->vm_mm = current->mm;
5847+ vma->vm_start = addr;
5848+ vma->vm_end = addr + PAGE_SIZE;
5849+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
5850+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5851+ vma->vm_ops = &pax_vm_ops;
5852+
5853+ ret = insert_vm_struct(current->mm, vma);
5854+ if (ret)
5855+ return ret;
5856+
5857+ ++current->mm->total_vm;
5858+ return 0;
5859+}
5860+#endif
5861+
5862+/*
5863+ * PaX: decide what to do with offenders (regs->pc = fault address)
5864+ *
5865+ * returns 1 when task should be killed
5866+ * 2 when patched PLT trampoline was detected
5867+ * 3 when unpatched PLT trampoline was detected
5868+ */
5869+static int pax_handle_fetch_fault(struct pt_regs *regs)
5870+{
5871+
5872+#ifdef CONFIG_PAX_EMUPLT
5873+ int err;
5874+
5875+ do { /* PaX: patched PLT emulation #1 */
5876+ unsigned int sethi1, sethi2, jmpl;
5877+
5878+ err = get_user(sethi1, (unsigned int *)regs->pc);
5879+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
5880+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
5881+
5882+ if (err)
5883+ break;
5884+
5885+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
5886+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
5887+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
5888+ {
5889+ unsigned int addr;
5890+
5891+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
5892+ addr = regs->u_regs[UREG_G1];
5893+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
5894+ regs->pc = addr;
5895+ regs->npc = addr+4;
5896+ return 2;
5897+ }
5898+ } while (0);
5899+
5900+ { /* PaX: patched PLT emulation #2 */
5901+ unsigned int ba;
5902+
5903+ err = get_user(ba, (unsigned int *)regs->pc);
5904+
5905+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
5906+ unsigned int addr;
5907+
5908+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
5909+ regs->pc = addr;
5910+ regs->npc = addr+4;
5911+ return 2;
5912+ }
5913+ }
5914+
5915+ do { /* PaX: patched PLT emulation #3 */
5916+ unsigned int sethi, jmpl, nop;
5917+
5918+ err = get_user(sethi, (unsigned int *)regs->pc);
5919+ err |= get_user(jmpl, (unsigned int *)(regs->pc+4));
5920+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
5921+
5922+ if (err)
5923+ break;
5924+
5925+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5926+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
5927+ nop == 0x01000000U)
5928+ {
5929+ unsigned int addr;
5930+
5931+ addr = (sethi & 0x003FFFFFU) << 10;
5932+ regs->u_regs[UREG_G1] = addr;
5933+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
5934+ regs->pc = addr;
5935+ regs->npc = addr+4;
5936+ return 2;
5937+ }
5938+ } while (0);
5939+
5940+ do { /* PaX: unpatched PLT emulation step 1 */
5941+ unsigned int sethi, ba, nop;
5942+
5943+ err = get_user(sethi, (unsigned int *)regs->pc);
5944+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
5945+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
5946+
5947+ if (err)
5948+ break;
5949+
5950+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
5951+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
5952+ nop == 0x01000000U)
5953+ {
5954+ unsigned int addr, save, call;
5955+
5956+ if ((ba & 0xFFC00000U) == 0x30800000U)
5957+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
5958+ else
5959+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
5960+
5961+ err = get_user(save, (unsigned int *)addr);
5962+ err |= get_user(call, (unsigned int *)(addr+4));
5963+ err |= get_user(nop, (unsigned int *)(addr+8));
5964+ if (err)
5965+ break;
5966+
5967+#ifdef CONFIG_PAX_DLRESOLVE
5968+ if (save == 0x9DE3BFA8U &&
5969+ (call & 0xC0000000U) == 0x40000000U &&
5970+ nop == 0x01000000U)
5971+ {
5972+ struct vm_area_struct *vma;
5973+ unsigned long call_dl_resolve;
5974+
5975+ down_read(&current->mm->mmap_sem);
5976+ call_dl_resolve = current->mm->call_dl_resolve;
5977+ up_read(&current->mm->mmap_sem);
5978+ if (likely(call_dl_resolve))
5979+ goto emulate;
5980+
5981+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
5982+
5983+ down_write(&current->mm->mmap_sem);
5984+ if (current->mm->call_dl_resolve) {
5985+ call_dl_resolve = current->mm->call_dl_resolve;
5986+ up_write(&current->mm->mmap_sem);
5987+ if (vma)
5988+ kmem_cache_free(vm_area_cachep, vma);
5989+ goto emulate;
5990+ }
5991+
5992+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
5993+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
5994+ up_write(&current->mm->mmap_sem);
5995+ if (vma)
5996+ kmem_cache_free(vm_area_cachep, vma);
5997+ return 1;
5998+ }
5999+
6000+ if (pax_insert_vma(vma, call_dl_resolve)) {
6001+ up_write(&current->mm->mmap_sem);
6002+ kmem_cache_free(vm_area_cachep, vma);
6003+ return 1;
6004+ }
6005+
6006+ current->mm->call_dl_resolve = call_dl_resolve;
6007+ up_write(&current->mm->mmap_sem);
6008+
6009+emulate:
6010+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6011+ regs->pc = call_dl_resolve;
6012+ regs->npc = addr+4;
6013+ return 3;
6014+ }
6015+#endif
6016+
6017+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6018+ if ((save & 0xFFC00000U) == 0x05000000U &&
6019+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6020+ nop == 0x01000000U)
6021+ {
6022+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6023+ regs->u_regs[UREG_G2] = addr + 4;
6024+ addr = (save & 0x003FFFFFU) << 10;
6025+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6026+ regs->pc = addr;
6027+ regs->npc = addr+4;
6028+ return 3;
6029+ }
6030+ }
6031+ } while (0);
6032+
6033+ do { /* PaX: unpatched PLT emulation step 2 */
6034+ unsigned int save, call, nop;
6035+
6036+ err = get_user(save, (unsigned int *)(regs->pc-4));
6037+ err |= get_user(call, (unsigned int *)regs->pc);
6038+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
6039+ if (err)
6040+ break;
6041+
6042+ if (save == 0x9DE3BFA8U &&
6043+ (call & 0xC0000000U) == 0x40000000U &&
6044+ nop == 0x01000000U)
6045+ {
6046+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
6047+
6048+ regs->u_regs[UREG_RETPC] = regs->pc;
6049+ regs->pc = dl_resolve;
6050+ regs->npc = dl_resolve+4;
6051+ return 3;
6052+ }
6053+ } while (0);
6054+#endif
6055+
6056+ return 1;
6057+}
6058+
6059+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6060+{
6061+ unsigned long i;
6062+
6063+ printk(KERN_ERR "PAX: bytes at PC: ");
6064+ for (i = 0; i < 8; i++) {
6065+ unsigned int c;
6066+ if (get_user(c, (unsigned int *)pc+i))
6067+ printk(KERN_CONT "???????? ");
6068+ else
6069+ printk(KERN_CONT "%08x ", c);
6070+ }
6071+ printk("\n");
6072+}
6073+#endif
6074+
6075 asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
6076 unsigned long address)
6077 {
6078@@ -231,6 +495,24 @@ good_area:
6079 if(!(vma->vm_flags & VM_WRITE))
6080 goto bad_area;
6081 } else {
6082+
6083+#ifdef CONFIG_PAX_PAGEEXEC
6084+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
6085+ up_read(&mm->mmap_sem);
6086+ switch (pax_handle_fetch_fault(regs)) {
6087+
6088+#ifdef CONFIG_PAX_EMUPLT
6089+ case 2:
6090+ case 3:
6091+ return;
6092+#endif
6093+
6094+ }
6095+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
6096+ do_group_exit(SIGKILL);
6097+ }
6098+#endif
6099+
6100 /* Allow reads even for write-only mappings */
6101 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
6102 goto bad_area;
6103diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
6104index 43b0da9..a0b78f9 100644
6105--- a/arch/sparc/mm/fault_64.c
6106+++ b/arch/sparc/mm/fault_64.c
6107@@ -20,6 +20,9 @@
6108 #include <linux/kprobes.h>
6109 #include <linux/kdebug.h>
6110 #include <linux/percpu.h>
6111+#include <linux/slab.h>
6112+#include <linux/pagemap.h>
6113+#include <linux/compiler.h>
6114
6115 #include <asm/page.h>
6116 #include <asm/pgtable.h>
6117@@ -78,7 +81,7 @@ static void bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
6118 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
6119 regs->tpc);
6120 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
6121- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
6122+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
6123 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
6124 dump_stack();
6125 unhandled_fault(regs->tpc, current, regs);
6126@@ -249,6 +252,456 @@ static void noinline bogus_32bit_fault_address(struct pt_regs *regs,
6127 show_regs(regs);
6128 }
6129
6130+#ifdef CONFIG_PAX_PAGEEXEC
6131+#ifdef CONFIG_PAX_DLRESOLVE
6132+static void pax_emuplt_close(struct vm_area_struct *vma)
6133+{
6134+ vma->vm_mm->call_dl_resolve = 0UL;
6135+}
6136+
6137+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6138+{
6139+ unsigned int *kaddr;
6140+
6141+ vmf->page = alloc_page(GFP_HIGHUSER);
6142+ if (!vmf->page)
6143+ return VM_FAULT_OOM;
6144+
6145+ kaddr = kmap(vmf->page);
6146+ memset(kaddr, 0, PAGE_SIZE);
6147+ kaddr[0] = 0x9DE3BFA8U; /* save */
6148+ flush_dcache_page(vmf->page);
6149+ kunmap(vmf->page);
6150+ return VM_FAULT_MAJOR;
6151+}
6152+
6153+static const struct vm_operations_struct pax_vm_ops = {
6154+ .close = pax_emuplt_close,
6155+ .fault = pax_emuplt_fault
6156+};
6157+
6158+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6159+{
6160+ int ret;
6161+
6162+ vma->vm_mm = current->mm;
6163+ vma->vm_start = addr;
6164+ vma->vm_end = addr + PAGE_SIZE;
6165+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6166+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6167+ vma->vm_ops = &pax_vm_ops;
6168+
6169+ ret = insert_vm_struct(current->mm, vma);
6170+ if (ret)
6171+ return ret;
6172+
6173+ ++current->mm->total_vm;
6174+ return 0;
6175+}
6176+#endif
6177+
6178+/*
6179+ * PaX: decide what to do with offenders (regs->tpc = fault address)
6180+ *
6181+ * returns 1 when task should be killed
6182+ * 2 when patched PLT trampoline was detected
6183+ * 3 when unpatched PLT trampoline was detected
6184+ */
6185+static int pax_handle_fetch_fault(struct pt_regs *regs)
6186+{
6187+
6188+#ifdef CONFIG_PAX_EMUPLT
6189+ int err;
6190+
6191+ do { /* PaX: patched PLT emulation #1 */
6192+ unsigned int sethi1, sethi2, jmpl;
6193+
6194+ err = get_user(sethi1, (unsigned int *)regs->tpc);
6195+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
6196+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
6197+
6198+ if (err)
6199+ break;
6200+
6201+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6202+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
6203+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
6204+ {
6205+ unsigned long addr;
6206+
6207+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6208+ addr = regs->u_regs[UREG_G1];
6209+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6210+
6211+ if (test_thread_flag(TIF_32BIT))
6212+ addr &= 0xFFFFFFFFUL;
6213+
6214+ regs->tpc = addr;
6215+ regs->tnpc = addr+4;
6216+ return 2;
6217+ }
6218+ } while (0);
6219+
6220+ { /* PaX: patched PLT emulation #2 */
6221+ unsigned int ba;
6222+
6223+ err = get_user(ba, (unsigned int *)regs->tpc);
6224+
6225+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6226+ unsigned long addr;
6227+
6228+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6229+
6230+ if (test_thread_flag(TIF_32BIT))
6231+ addr &= 0xFFFFFFFFUL;
6232+
6233+ regs->tpc = addr;
6234+ regs->tnpc = addr+4;
6235+ return 2;
6236+ }
6237+ }
6238+
6239+ do { /* PaX: patched PLT emulation #3 */
6240+ unsigned int sethi, jmpl, nop;
6241+
6242+ err = get_user(sethi, (unsigned int *)regs->tpc);
6243+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+4));
6244+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6245+
6246+ if (err)
6247+ break;
6248+
6249+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6250+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6251+ nop == 0x01000000U)
6252+ {
6253+ unsigned long addr;
6254+
6255+ addr = (sethi & 0x003FFFFFU) << 10;
6256+ regs->u_regs[UREG_G1] = addr;
6257+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6258+
6259+ if (test_thread_flag(TIF_32BIT))
6260+ addr &= 0xFFFFFFFFUL;
6261+
6262+ regs->tpc = addr;
6263+ regs->tnpc = addr+4;
6264+ return 2;
6265+ }
6266+ } while (0);
6267+
6268+ do { /* PaX: patched PLT emulation #4 */
6269+ unsigned int sethi, mov1, call, mov2;
6270+
6271+ err = get_user(sethi, (unsigned int *)regs->tpc);
6272+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
6273+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
6274+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
6275+
6276+ if (err)
6277+ break;
6278+
6279+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6280+ mov1 == 0x8210000FU &&
6281+ (call & 0xC0000000U) == 0x40000000U &&
6282+ mov2 == 0x9E100001U)
6283+ {
6284+ unsigned long addr;
6285+
6286+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
6287+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6288+
6289+ if (test_thread_flag(TIF_32BIT))
6290+ addr &= 0xFFFFFFFFUL;
6291+
6292+ regs->tpc = addr;
6293+ regs->tnpc = addr+4;
6294+ return 2;
6295+ }
6296+ } while (0);
6297+
6298+ do { /* PaX: patched PLT emulation #5 */
6299+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
6300+
6301+ err = get_user(sethi, (unsigned int *)regs->tpc);
6302+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6303+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6304+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
6305+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
6306+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
6307+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
6308+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
6309+
6310+ if (err)
6311+ break;
6312+
6313+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6314+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6315+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6316+ (or1 & 0xFFFFE000U) == 0x82106000U &&
6317+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6318+ sllx == 0x83287020U &&
6319+ jmpl == 0x81C04005U &&
6320+ nop == 0x01000000U)
6321+ {
6322+ unsigned long addr;
6323+
6324+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6325+ regs->u_regs[UREG_G1] <<= 32;
6326+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6327+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6328+ regs->tpc = addr;
6329+ regs->tnpc = addr+4;
6330+ return 2;
6331+ }
6332+ } while (0);
6333+
6334+ do { /* PaX: patched PLT emulation #6 */
6335+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
6336+
6337+ err = get_user(sethi, (unsigned int *)regs->tpc);
6338+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6339+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6340+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
6341+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
6342+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
6343+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
6344+
6345+ if (err)
6346+ break;
6347+
6348+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6349+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6350+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6351+ sllx == 0x83287020U &&
6352+ (or & 0xFFFFE000U) == 0x8A116000U &&
6353+ jmpl == 0x81C04005U &&
6354+ nop == 0x01000000U)
6355+ {
6356+ unsigned long addr;
6357+
6358+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
6359+ regs->u_regs[UREG_G1] <<= 32;
6360+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
6361+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6362+ regs->tpc = addr;
6363+ regs->tnpc = addr+4;
6364+ return 2;
6365+ }
6366+ } while (0);
6367+
6368+ do { /* PaX: unpatched PLT emulation step 1 */
6369+ unsigned int sethi, ba, nop;
6370+
6371+ err = get_user(sethi, (unsigned int *)regs->tpc);
6372+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6373+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6374+
6375+ if (err)
6376+ break;
6377+
6378+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6379+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6380+ nop == 0x01000000U)
6381+ {
6382+ unsigned long addr;
6383+ unsigned int save, call;
6384+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
6385+
6386+ if ((ba & 0xFFC00000U) == 0x30800000U)
6387+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6388+ else
6389+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6390+
6391+ if (test_thread_flag(TIF_32BIT))
6392+ addr &= 0xFFFFFFFFUL;
6393+
6394+ err = get_user(save, (unsigned int *)addr);
6395+ err |= get_user(call, (unsigned int *)(addr+4));
6396+ err |= get_user(nop, (unsigned int *)(addr+8));
6397+ if (err)
6398+ break;
6399+
6400+#ifdef CONFIG_PAX_DLRESOLVE
6401+ if (save == 0x9DE3BFA8U &&
6402+ (call & 0xC0000000U) == 0x40000000U &&
6403+ nop == 0x01000000U)
6404+ {
6405+ struct vm_area_struct *vma;
6406+ unsigned long call_dl_resolve;
6407+
6408+ down_read(&current->mm->mmap_sem);
6409+ call_dl_resolve = current->mm->call_dl_resolve;
6410+ up_read(&current->mm->mmap_sem);
6411+ if (likely(call_dl_resolve))
6412+ goto emulate;
6413+
6414+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6415+
6416+ down_write(&current->mm->mmap_sem);
6417+ if (current->mm->call_dl_resolve) {
6418+ call_dl_resolve = current->mm->call_dl_resolve;
6419+ up_write(&current->mm->mmap_sem);
6420+ if (vma)
6421+ kmem_cache_free(vm_area_cachep, vma);
6422+ goto emulate;
6423+ }
6424+
6425+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6426+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6427+ up_write(&current->mm->mmap_sem);
6428+ if (vma)
6429+ kmem_cache_free(vm_area_cachep, vma);
6430+ return 1;
6431+ }
6432+
6433+ if (pax_insert_vma(vma, call_dl_resolve)) {
6434+ up_write(&current->mm->mmap_sem);
6435+ kmem_cache_free(vm_area_cachep, vma);
6436+ return 1;
6437+ }
6438+
6439+ current->mm->call_dl_resolve = call_dl_resolve;
6440+ up_write(&current->mm->mmap_sem);
6441+
6442+emulate:
6443+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6444+ regs->tpc = call_dl_resolve;
6445+ regs->tnpc = addr+4;
6446+ return 3;
6447+ }
6448+#endif
6449+
6450+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6451+ if ((save & 0xFFC00000U) == 0x05000000U &&
6452+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6453+ nop == 0x01000000U)
6454+ {
6455+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6456+ regs->u_regs[UREG_G2] = addr + 4;
6457+ addr = (save & 0x003FFFFFU) << 10;
6458+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6459+
6460+ if (test_thread_flag(TIF_32BIT))
6461+ addr &= 0xFFFFFFFFUL;
6462+
6463+ regs->tpc = addr;
6464+ regs->tnpc = addr+4;
6465+ return 3;
6466+ }
6467+
6468+ /* PaX: 64-bit PLT stub */
6469+ err = get_user(sethi1, (unsigned int *)addr);
6470+ err |= get_user(sethi2, (unsigned int *)(addr+4));
6471+ err |= get_user(or1, (unsigned int *)(addr+8));
6472+ err |= get_user(or2, (unsigned int *)(addr+12));
6473+ err |= get_user(sllx, (unsigned int *)(addr+16));
6474+ err |= get_user(add, (unsigned int *)(addr+20));
6475+ err |= get_user(jmpl, (unsigned int *)(addr+24));
6476+ err |= get_user(nop, (unsigned int *)(addr+28));
6477+ if (err)
6478+ break;
6479+
6480+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
6481+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6482+ (or1 & 0xFFFFE000U) == 0x88112000U &&
6483+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6484+ sllx == 0x89293020U &&
6485+ add == 0x8A010005U &&
6486+ jmpl == 0x89C14000U &&
6487+ nop == 0x01000000U)
6488+ {
6489+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6490+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6491+ regs->u_regs[UREG_G4] <<= 32;
6492+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6493+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
6494+ regs->u_regs[UREG_G4] = addr + 24;
6495+ addr = regs->u_regs[UREG_G5];
6496+ regs->tpc = addr;
6497+ regs->tnpc = addr+4;
6498+ return 3;
6499+ }
6500+ }
6501+ } while (0);
6502+
6503+#ifdef CONFIG_PAX_DLRESOLVE
6504+ do { /* PaX: unpatched PLT emulation step 2 */
6505+ unsigned int save, call, nop;
6506+
6507+ err = get_user(save, (unsigned int *)(regs->tpc-4));
6508+ err |= get_user(call, (unsigned int *)regs->tpc);
6509+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
6510+ if (err)
6511+ break;
6512+
6513+ if (save == 0x9DE3BFA8U &&
6514+ (call & 0xC0000000U) == 0x40000000U &&
6515+ nop == 0x01000000U)
6516+ {
6517+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6518+
6519+ if (test_thread_flag(TIF_32BIT))
6520+ dl_resolve &= 0xFFFFFFFFUL;
6521+
6522+ regs->u_regs[UREG_RETPC] = regs->tpc;
6523+ regs->tpc = dl_resolve;
6524+ regs->tnpc = dl_resolve+4;
6525+ return 3;
6526+ }
6527+ } while (0);
6528+#endif
6529+
6530+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
6531+ unsigned int sethi, ba, nop;
6532+
6533+ err = get_user(sethi, (unsigned int *)regs->tpc);
6534+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6535+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6536+
6537+ if (err)
6538+ break;
6539+
6540+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6541+ (ba & 0xFFF00000U) == 0x30600000U &&
6542+ nop == 0x01000000U)
6543+ {
6544+ unsigned long addr;
6545+
6546+ addr = (sethi & 0x003FFFFFU) << 10;
6547+ regs->u_regs[UREG_G1] = addr;
6548+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6549+
6550+ if (test_thread_flag(TIF_32BIT))
6551+ addr &= 0xFFFFFFFFUL;
6552+
6553+ regs->tpc = addr;
6554+ regs->tnpc = addr+4;
6555+ return 2;
6556+ }
6557+ } while (0);
6558+
6559+#endif
6560+
6561+ return 1;
6562+}
6563+
6564+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6565+{
6566+ unsigned long i;
6567+
6568+ printk(KERN_ERR "PAX: bytes at PC: ");
6569+ for (i = 0; i < 8; i++) {
6570+ unsigned int c;
6571+ if (get_user(c, (unsigned int *)pc+i))
6572+ printk(KERN_CONT "???????? ");
6573+ else
6574+ printk(KERN_CONT "%08x ", c);
6575+ }
6576+ printk("\n");
6577+}
6578+#endif
6579+
6580 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6581 {
6582 struct mm_struct *mm = current->mm;
6583@@ -315,6 +768,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6584 if (!vma)
6585 goto bad_area;
6586
6587+#ifdef CONFIG_PAX_PAGEEXEC
6588+ /* PaX: detect ITLB misses on non-exec pages */
6589+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
6590+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
6591+ {
6592+ if (address != regs->tpc)
6593+ goto good_area;
6594+
6595+ up_read(&mm->mmap_sem);
6596+ switch (pax_handle_fetch_fault(regs)) {
6597+
6598+#ifdef CONFIG_PAX_EMUPLT
6599+ case 2:
6600+ case 3:
6601+ return;
6602+#endif
6603+
6604+ }
6605+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
6606+ do_group_exit(SIGKILL);
6607+ }
6608+#endif
6609+
6610 /* Pure DTLB misses do not tell us whether the fault causing
6611 * load/store/atomic was a write or not, it only says that there
6612 * was no match. So in such a case we (carefully) read the
6613diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
6614index f27d103..1b06377 100644
6615--- a/arch/sparc/mm/hugetlbpage.c
6616+++ b/arch/sparc/mm/hugetlbpage.c
6617@@ -69,7 +69,7 @@ full_search:
6618 }
6619 return -ENOMEM;
6620 }
6621- if (likely(!vma || addr + len <= vma->vm_start)) {
6622+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6623 /*
6624 * Remember the place where we stopped the search:
6625 */
6626@@ -108,7 +108,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6627 /* make sure it can fit in the remaining address space */
6628 if (likely(addr > len)) {
6629 vma = find_vma(mm, addr-len);
6630- if (!vma || addr <= vma->vm_start) {
6631+ if (check_heap_stack_gap(vma, addr - len, len)) {
6632 /* remember the address as a hint for next time */
6633 return (mm->free_area_cache = addr-len);
6634 }
6635@@ -117,16 +117,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6636 if (unlikely(mm->mmap_base < len))
6637 goto bottomup;
6638
6639- addr = (mm->mmap_base-len) & HPAGE_MASK;
6640+ addr = mm->mmap_base - len;
6641
6642 do {
6643+ addr &= HPAGE_MASK;
6644 /*
6645 * Lookup failure means no vma is above this address,
6646 * else if new region fits below vma->vm_start,
6647 * return with success:
6648 */
6649 vma = find_vma(mm, addr);
6650- if (likely(!vma || addr+len <= vma->vm_start)) {
6651+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6652 /* remember the address as a hint for next time */
6653 return (mm->free_area_cache = addr);
6654 }
6655@@ -136,8 +137,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6656 mm->cached_hole_size = vma->vm_start - addr;
6657
6658 /* try just below the current vma->vm_start */
6659- addr = (vma->vm_start-len) & HPAGE_MASK;
6660- } while (likely(len < vma->vm_start));
6661+ addr = skip_heap_stack_gap(vma, len);
6662+ } while (!IS_ERR_VALUE(addr));
6663
6664 bottomup:
6665 /*
6666@@ -183,8 +184,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
6667 if (addr) {
6668 addr = ALIGN(addr, HPAGE_SIZE);
6669 vma = find_vma(mm, addr);
6670- if (task_size - len >= addr &&
6671- (!vma || addr + len <= vma->vm_start))
6672+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
6673 return addr;
6674 }
6675 if (mm->get_unmapped_area == arch_get_unmapped_area)
6676diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
6677index dc7c3b1..34c0070 100644
6678--- a/arch/sparc/mm/init_32.c
6679+++ b/arch/sparc/mm/init_32.c
6680@@ -317,6 +317,9 @@ extern void device_scan(void);
6681 pgprot_t PAGE_SHARED __read_mostly;
6682 EXPORT_SYMBOL(PAGE_SHARED);
6683
6684+pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
6685+EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
6686+
6687 void __init paging_init(void)
6688 {
6689 switch(sparc_cpu_model) {
6690@@ -345,17 +348,17 @@ void __init paging_init(void)
6691
6692 /* Initialize the protection map with non-constant, MMU dependent values. */
6693 protection_map[0] = PAGE_NONE;
6694- protection_map[1] = PAGE_READONLY;
6695- protection_map[2] = PAGE_COPY;
6696- protection_map[3] = PAGE_COPY;
6697+ protection_map[1] = PAGE_READONLY_NOEXEC;
6698+ protection_map[2] = PAGE_COPY_NOEXEC;
6699+ protection_map[3] = PAGE_COPY_NOEXEC;
6700 protection_map[4] = PAGE_READONLY;
6701 protection_map[5] = PAGE_READONLY;
6702 protection_map[6] = PAGE_COPY;
6703 protection_map[7] = PAGE_COPY;
6704 protection_map[8] = PAGE_NONE;
6705- protection_map[9] = PAGE_READONLY;
6706- protection_map[10] = PAGE_SHARED;
6707- protection_map[11] = PAGE_SHARED;
6708+ protection_map[9] = PAGE_READONLY_NOEXEC;
6709+ protection_map[10] = PAGE_SHARED_NOEXEC;
6710+ protection_map[11] = PAGE_SHARED_NOEXEC;
6711 protection_map[12] = PAGE_READONLY;
6712 protection_map[13] = PAGE_READONLY;
6713 protection_map[14] = PAGE_SHARED;
6714diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
6715index 509b1ff..bfd7118 100644
6716--- a/arch/sparc/mm/srmmu.c
6717+++ b/arch/sparc/mm/srmmu.c
6718@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
6719 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
6720 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
6721 BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
6722+
6723+#ifdef CONFIG_PAX_PAGEEXEC
6724+ PAGE_SHARED_NOEXEC = pgprot_val(SRMMU_PAGE_SHARED_NOEXEC);
6725+ BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC));
6726+ BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEXEC));
6727+#endif
6728+
6729 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
6730 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
6731
6732diff --git a/arch/um/Makefile b/arch/um/Makefile
6733index fc633db..5e1a1c2 100644
6734--- a/arch/um/Makefile
6735+++ b/arch/um/Makefile
6736@@ -49,6 +49,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
6737 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
6738 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64
6739
6740+ifdef CONSTIFY_PLUGIN
6741+USER_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
6742+endif
6743+
6744 include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
6745
6746 #This will adjust *FLAGS accordingly to the platform.
6747diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
6748index 6c03acd..a5e0215 100644
6749--- a/arch/um/include/asm/kmap_types.h
6750+++ b/arch/um/include/asm/kmap_types.h
6751@@ -23,6 +23,7 @@ enum km_type {
6752 KM_IRQ1,
6753 KM_SOFTIRQ0,
6754 KM_SOFTIRQ1,
6755+ KM_CLEARPAGE,
6756 KM_TYPE_NR
6757 };
6758
6759diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
6760index 4cc9b6c..02e5029 100644
6761--- a/arch/um/include/asm/page.h
6762+++ b/arch/um/include/asm/page.h
6763@@ -14,6 +14,9 @@
6764 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
6765 #define PAGE_MASK (~(PAGE_SIZE-1))
6766
6767+#define ktla_ktva(addr) (addr)
6768+#define ktva_ktla(addr) (addr)
6769+
6770 #ifndef __ASSEMBLY__
6771
6772 struct page;
6773diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
6774index 4a28a15..654dc2a 100644
6775--- a/arch/um/kernel/process.c
6776+++ b/arch/um/kernel/process.c
6777@@ -393,22 +393,6 @@ int singlestepping(void * t)
6778 return 2;
6779 }
6780
6781-/*
6782- * Only x86 and x86_64 have an arch_align_stack().
6783- * All other arches have "#define arch_align_stack(x) (x)"
6784- * in their asm/system.h
6785- * As this is included in UML from asm-um/system-generic.h,
6786- * we can use it to behave as the subarch does.
6787- */
6788-#ifndef arch_align_stack
6789-unsigned long arch_align_stack(unsigned long sp)
6790-{
6791- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6792- sp -= get_random_int() % 8192;
6793- return sp & ~0xf;
6794-}
6795-#endif
6796-
6797 unsigned long get_wchan(struct task_struct *p)
6798 {
6799 unsigned long stack_page, sp, ip;
6800diff --git a/arch/um/sys-i386/shared/sysdep/system.h b/arch/um/sys-i386/shared/sysdep/system.h
6801index d1b93c4..ae1b7fd 100644
6802--- a/arch/um/sys-i386/shared/sysdep/system.h
6803+++ b/arch/um/sys-i386/shared/sysdep/system.h
6804@@ -17,7 +17,7 @@
6805 # define AT_VECTOR_SIZE_ARCH 1
6806 #endif
6807
6808-extern unsigned long arch_align_stack(unsigned long sp);
6809+#define arch_align_stack(x) ((x) & ~0xfUL)
6810
6811 void default_idle(void);
6812
6813diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c
6814index 857ca0b..9a2669d 100644
6815--- a/arch/um/sys-i386/syscalls.c
6816+++ b/arch/um/sys-i386/syscalls.c
6817@@ -11,6 +11,21 @@
6818 #include "asm/uaccess.h"
6819 #include "asm/unistd.h"
6820
6821+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
6822+{
6823+ unsigned long pax_task_size = TASK_SIZE;
6824+
6825+#ifdef CONFIG_PAX_SEGMEXEC
6826+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
6827+ pax_task_size = SEGMEXEC_TASK_SIZE;
6828+#endif
6829+
6830+ if (len > pax_task_size || addr > pax_task_size - len)
6831+ return -EINVAL;
6832+
6833+ return 0;
6834+}
6835+
6836 /*
6837 * Perform the select(nd, in, out, ex, tv) and mmap() system
6838 * calls. Linux/i386 didn't use to be able to handle more than
6839diff --git a/arch/um/sys-x86_64/shared/sysdep/system.h b/arch/um/sys-x86_64/shared/sysdep/system.h
6840index d1b93c4..ae1b7fd 100644
6841--- a/arch/um/sys-x86_64/shared/sysdep/system.h
6842+++ b/arch/um/sys-x86_64/shared/sysdep/system.h
6843@@ -17,7 +17,7 @@
6844 # define AT_VECTOR_SIZE_ARCH 1
6845 #endif
6846
6847-extern unsigned long arch_align_stack(unsigned long sp);
6848+#define arch_align_stack(x) ((x) & ~0xfUL)
6849
6850 void default_idle(void);
6851
6852diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
6853index 73ae02a..f932de5 100644
6854--- a/arch/x86/Kconfig
6855+++ b/arch/x86/Kconfig
6856@@ -223,7 +223,7 @@ config X86_TRAMPOLINE
6857
6858 config X86_32_LAZY_GS
6859 def_bool y
6860- depends on X86_32 && !CC_STACKPROTECTOR
6861+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
6862
6863 config KTIME_SCALAR
6864 def_bool X86_32
6865@@ -1008,7 +1008,7 @@ choice
6866
6867 config NOHIGHMEM
6868 bool "off"
6869- depends on !X86_NUMAQ
6870+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
6871 ---help---
6872 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
6873 However, the address space of 32-bit x86 processors is only 4
6874@@ -1045,7 +1045,7 @@ config NOHIGHMEM
6875
6876 config HIGHMEM4G
6877 bool "4GB"
6878- depends on !X86_NUMAQ
6879+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
6880 ---help---
6881 Select this if you have a 32-bit processor and between 1 and 4
6882 gigabytes of physical RAM.
6883@@ -1099,7 +1099,7 @@ config PAGE_OFFSET
6884 hex
6885 default 0xB0000000 if VMSPLIT_3G_OPT
6886 default 0x80000000 if VMSPLIT_2G
6887- default 0x78000000 if VMSPLIT_2G_OPT
6888+ default 0x70000000 if VMSPLIT_2G_OPT
6889 default 0x40000000 if VMSPLIT_1G
6890 default 0xC0000000
6891 depends on X86_32
6892@@ -1460,6 +1460,7 @@ config SECCOMP
6893
6894 config CC_STACKPROTECTOR
6895 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
6896+ depends on X86_64 || !PAX_MEMORY_UDEREF
6897 ---help---
6898 This option turns on the -fstack-protector GCC feature. This
6899 feature puts, at the beginning of functions, a canary value on
6900@@ -1517,6 +1518,7 @@ config KEXEC_JUMP
6901 config PHYSICAL_START
6902 hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
6903 default "0x1000000"
6904+ range 0x400000 0x40000000
6905 ---help---
6906 This gives the physical address where the kernel is loaded.
6907
6908@@ -1581,6 +1583,7 @@ config PHYSICAL_ALIGN
6909 hex
6910 prompt "Alignment value to which kernel should be aligned" if X86_32
6911 default "0x1000000"
6912+ range 0x400000 0x1000000 if PAX_KERNEXEC
6913 range 0x2000 0x1000000
6914 ---help---
6915 This value puts the alignment restrictions on physical address
6916@@ -1612,9 +1615,10 @@ config HOTPLUG_CPU
6917 Say N if you want to disable CPU hotplug.
6918
6919 config COMPAT_VDSO
6920- def_bool y
6921+ def_bool n
6922 prompt "Compat VDSO support"
6923 depends on X86_32 || IA32_EMULATION
6924+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
6925 ---help---
6926 Map the 32-bit VDSO to the predictable old-style address too.
6927 ---help---
6928diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
6929index 0e566103..1a6b57e 100644
6930--- a/arch/x86/Kconfig.cpu
6931+++ b/arch/x86/Kconfig.cpu
6932@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
6933
6934 config X86_F00F_BUG
6935 def_bool y
6936- depends on M586MMX || M586TSC || M586 || M486 || M386
6937+ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
6938
6939 config X86_WP_WORKS_OK
6940 def_bool y
6941@@ -360,7 +360,7 @@ config X86_POPAD_OK
6942
6943 config X86_ALIGNMENT_16
6944 def_bool y
6945- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
6946+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
6947
6948 config X86_INTEL_USERCOPY
6949 def_bool y
6950@@ -406,7 +406,7 @@ config X86_CMPXCHG64
6951 # generates cmov.
6952 config X86_CMOV
6953 def_bool y
6954- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
6955+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
6956
6957 config X86_MINIMUM_CPU_FAMILY
6958 int
6959diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
6960index d105f29..c928727 100644
6961--- a/arch/x86/Kconfig.debug
6962+++ b/arch/x86/Kconfig.debug
6963@@ -99,7 +99,7 @@ config X86_PTDUMP
6964 config DEBUG_RODATA
6965 bool "Write protect kernel read-only data structures"
6966 default y
6967- depends on DEBUG_KERNEL
6968+ depends on DEBUG_KERNEL && BROKEN
6969 ---help---
6970 Mark the kernel read-only data as write-protected in the pagetables,
6971 in order to catch accidental (and incorrect) writes to such const
6972diff --git a/arch/x86/Makefile b/arch/x86/Makefile
6973index d2d24c9..0f21f8d 100644
6974--- a/arch/x86/Makefile
6975+++ b/arch/x86/Makefile
6976@@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
6977 else
6978 BITS := 64
6979 UTS_MACHINE := x86_64
6980+ biarch := $(call cc-option,-m64)
6981 CHECKFLAGS += -D__x86_64__ -m64
6982
6983 KBUILD_AFLAGS += -m64
6984@@ -189,3 +190,12 @@ define archhelp
6985 echo ' FDARGS="..." arguments for the booted kernel'
6986 echo ' FDINITRD=file initrd for the booted kernel'
6987 endef
6988+
6989+define OLD_LD
6990+
6991+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
6992+*** Please upgrade your binutils to 2.18 or newer
6993+endef
6994+
6995+archprepare:
6996+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
6997diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
6998index ec749c2..bbb5319 100644
6999--- a/arch/x86/boot/Makefile
7000+++ b/arch/x86/boot/Makefile
7001@@ -69,6 +69,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
7002 $(call cc-option, -fno-stack-protector) \
7003 $(call cc-option, -mpreferred-stack-boundary=2)
7004 KBUILD_CFLAGS += $(call cc-option, -m32)
7005+ifdef CONSTIFY_PLUGIN
7006+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7007+endif
7008 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7009 GCOV_PROFILE := n
7010
7011diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
7012index 878e4b9..20537ab 100644
7013--- a/arch/x86/boot/bitops.h
7014+++ b/arch/x86/boot/bitops.h
7015@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7016 u8 v;
7017 const u32 *p = (const u32 *)addr;
7018
7019- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7020+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7021 return v;
7022 }
7023
7024@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7025
7026 static inline void set_bit(int nr, void *addr)
7027 {
7028- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7029+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7030 }
7031
7032 #endif /* BOOT_BITOPS_H */
7033diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
7034index 98239d2..f40214c 100644
7035--- a/arch/x86/boot/boot.h
7036+++ b/arch/x86/boot/boot.h
7037@@ -82,7 +82,7 @@ static inline void io_delay(void)
7038 static inline u16 ds(void)
7039 {
7040 u16 seg;
7041- asm("movw %%ds,%0" : "=rm" (seg));
7042+ asm volatile("movw %%ds,%0" : "=rm" (seg));
7043 return seg;
7044 }
7045
7046@@ -178,7 +178,7 @@ static inline void wrgs32(u32 v, addr_t addr)
7047 static inline int memcmp(const void *s1, const void *s2, size_t len)
7048 {
7049 u8 diff;
7050- asm("repe; cmpsb; setnz %0"
7051+ asm volatile("repe; cmpsb; setnz %0"
7052 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
7053 return diff;
7054 }
7055diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
7056index f8ed065..5bf5ff3 100644
7057--- a/arch/x86/boot/compressed/Makefile
7058+++ b/arch/x86/boot/compressed/Makefile
7059@@ -13,6 +13,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
7060 KBUILD_CFLAGS += $(cflags-y)
7061 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
7062 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
7063+ifdef CONSTIFY_PLUGIN
7064+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7065+endif
7066
7067 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7068 GCOV_PROFILE := n
7069diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
7070index f543b70..b60fba8 100644
7071--- a/arch/x86/boot/compressed/head_32.S
7072+++ b/arch/x86/boot/compressed/head_32.S
7073@@ -76,7 +76,7 @@ ENTRY(startup_32)
7074 notl %eax
7075 andl %eax, %ebx
7076 #else
7077- movl $LOAD_PHYSICAL_ADDR, %ebx
7078+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7079 #endif
7080
7081 /* Target address to relocate to for decompression */
7082@@ -149,7 +149,7 @@ relocated:
7083 * and where it was actually loaded.
7084 */
7085 movl %ebp, %ebx
7086- subl $LOAD_PHYSICAL_ADDR, %ebx
7087+ subl $____LOAD_PHYSICAL_ADDR, %ebx
7088 jz 2f /* Nothing to be done if loaded at compiled addr. */
7089 /*
7090 * Process relocations.
7091@@ -157,8 +157,7 @@ relocated:
7092
7093 1: subl $4, %edi
7094 movl (%edi), %ecx
7095- testl %ecx, %ecx
7096- jz 2f
7097+ jecxz 2f
7098 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
7099 jmp 1b
7100 2:
7101diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
7102index 077e1b6..2c6b13b 100644
7103--- a/arch/x86/boot/compressed/head_64.S
7104+++ b/arch/x86/boot/compressed/head_64.S
7105@@ -91,7 +91,7 @@ ENTRY(startup_32)
7106 notl %eax
7107 andl %eax, %ebx
7108 #else
7109- movl $LOAD_PHYSICAL_ADDR, %ebx
7110+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7111 #endif
7112
7113 /* Target address to relocate to for decompression */
7114@@ -183,7 +183,7 @@ no_longmode:
7115 hlt
7116 jmp 1b
7117
7118-#include "../../kernel/verify_cpu_64.S"
7119+#include "../../kernel/verify_cpu.S"
7120
7121 /*
7122 * Be careful here startup_64 needs to be at a predictable
7123@@ -234,7 +234,7 @@ ENTRY(startup_64)
7124 notq %rax
7125 andq %rax, %rbp
7126 #else
7127- movq $LOAD_PHYSICAL_ADDR, %rbp
7128+ movq $____LOAD_PHYSICAL_ADDR, %rbp
7129 #endif
7130
7131 /* Target address to relocate to for decompression */
7132diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
7133index 842b2a3..f00178b 100644
7134--- a/arch/x86/boot/compressed/misc.c
7135+++ b/arch/x86/boot/compressed/misc.c
7136@@ -288,7 +288,7 @@ static void parse_elf(void *output)
7137 case PT_LOAD:
7138 #ifdef CONFIG_RELOCATABLE
7139 dest = output;
7140- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
7141+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
7142 #else
7143 dest = (void *)(phdr->p_paddr);
7144 #endif
7145@@ -335,7 +335,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
7146 error("Destination address too large");
7147 #endif
7148 #ifndef CONFIG_RELOCATABLE
7149- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
7150+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
7151 error("Wrong destination address");
7152 #endif
7153
7154diff --git a/arch/x86/boot/compressed/mkpiggy.c b/arch/x86/boot/compressed/mkpiggy.c
7155index bcbd36c..b1754af 100644
7156--- a/arch/x86/boot/compressed/mkpiggy.c
7157+++ b/arch/x86/boot/compressed/mkpiggy.c
7158@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
7159
7160 offs = (olen > ilen) ? olen - ilen : 0;
7161 offs += olen >> 12; /* Add 8 bytes for each 32K block */
7162- offs += 32*1024 + 18; /* Add 32K + 18 bytes slack */
7163+ offs += 64*1024; /* Add 64K bytes slack */
7164 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
7165
7166 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
7167diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
7168index bbeb0c3..f5167ab 100644
7169--- a/arch/x86/boot/compressed/relocs.c
7170+++ b/arch/x86/boot/compressed/relocs.c
7171@@ -10,8 +10,11 @@
7172 #define USE_BSD
7173 #include <endian.h>
7174
7175+#include "../../../../include/linux/autoconf.h"
7176+
7177 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
7178 static Elf32_Ehdr ehdr;
7179+static Elf32_Phdr *phdr;
7180 static unsigned long reloc_count, reloc_idx;
7181 static unsigned long *relocs;
7182
7183@@ -37,7 +40,7 @@ static const char* safe_abs_relocs[] = {
7184
7185 static int is_safe_abs_reloc(const char* sym_name)
7186 {
7187- int i;
7188+ unsigned int i;
7189
7190 for (i = 0; i < ARRAY_SIZE(safe_abs_relocs); i++) {
7191 if (!strcmp(sym_name, safe_abs_relocs[i]))
7192@@ -245,9 +248,39 @@ static void read_ehdr(FILE *fp)
7193 }
7194 }
7195
7196+static void read_phdrs(FILE *fp)
7197+{
7198+ unsigned int i;
7199+
7200+ phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
7201+ if (!phdr) {
7202+ die("Unable to allocate %d program headers\n",
7203+ ehdr.e_phnum);
7204+ }
7205+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
7206+ die("Seek to %d failed: %s\n",
7207+ ehdr.e_phoff, strerror(errno));
7208+ }
7209+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
7210+ die("Cannot read ELF program headers: %s\n",
7211+ strerror(errno));
7212+ }
7213+ for(i = 0; i < ehdr.e_phnum; i++) {
7214+ phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
7215+ phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
7216+ phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
7217+ phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
7218+ phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
7219+ phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
7220+ phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
7221+ phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
7222+ }
7223+
7224+}
7225+
7226 static void read_shdrs(FILE *fp)
7227 {
7228- int i;
7229+ unsigned int i;
7230 Elf32_Shdr shdr;
7231
7232 secs = calloc(ehdr.e_shnum, sizeof(struct section));
7233@@ -282,7 +315,7 @@ static void read_shdrs(FILE *fp)
7234
7235 static void read_strtabs(FILE *fp)
7236 {
7237- int i;
7238+ unsigned int i;
7239 for (i = 0; i < ehdr.e_shnum; i++) {
7240 struct section *sec = &secs[i];
7241 if (sec->shdr.sh_type != SHT_STRTAB) {
7242@@ -307,7 +340,7 @@ static void read_strtabs(FILE *fp)
7243
7244 static void read_symtabs(FILE *fp)
7245 {
7246- int i,j;
7247+ unsigned int i,j;
7248 for (i = 0; i < ehdr.e_shnum; i++) {
7249 struct section *sec = &secs[i];
7250 if (sec->shdr.sh_type != SHT_SYMTAB) {
7251@@ -340,7 +373,9 @@ static void read_symtabs(FILE *fp)
7252
7253 static void read_relocs(FILE *fp)
7254 {
7255- int i,j;
7256+ unsigned int i,j;
7257+ uint32_t base;
7258+
7259 for (i = 0; i < ehdr.e_shnum; i++) {
7260 struct section *sec = &secs[i];
7261 if (sec->shdr.sh_type != SHT_REL) {
7262@@ -360,9 +395,18 @@ static void read_relocs(FILE *fp)
7263 die("Cannot read symbol table: %s\n",
7264 strerror(errno));
7265 }
7266+ base = 0;
7267+ for (j = 0; j < ehdr.e_phnum; j++) {
7268+ if (phdr[j].p_type != PT_LOAD )
7269+ continue;
7270+ 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)
7271+ continue;
7272+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
7273+ break;
7274+ }
7275 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
7276 Elf32_Rel *rel = &sec->reltab[j];
7277- rel->r_offset = elf32_to_cpu(rel->r_offset);
7278+ rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
7279 rel->r_info = elf32_to_cpu(rel->r_info);
7280 }
7281 }
7282@@ -371,14 +415,14 @@ static void read_relocs(FILE *fp)
7283
7284 static void print_absolute_symbols(void)
7285 {
7286- int i;
7287+ unsigned int i;
7288 printf("Absolute symbols\n");
7289 printf(" Num: Value Size Type Bind Visibility Name\n");
7290 for (i = 0; i < ehdr.e_shnum; i++) {
7291 struct section *sec = &secs[i];
7292 char *sym_strtab;
7293 Elf32_Sym *sh_symtab;
7294- int j;
7295+ unsigned int j;
7296
7297 if (sec->shdr.sh_type != SHT_SYMTAB) {
7298 continue;
7299@@ -406,14 +450,14 @@ static void print_absolute_symbols(void)
7300
7301 static void print_absolute_relocs(void)
7302 {
7303- int i, printed = 0;
7304+ unsigned int i, printed = 0;
7305
7306 for (i = 0; i < ehdr.e_shnum; i++) {
7307 struct section *sec = &secs[i];
7308 struct section *sec_applies, *sec_symtab;
7309 char *sym_strtab;
7310 Elf32_Sym *sh_symtab;
7311- int j;
7312+ unsigned int j;
7313 if (sec->shdr.sh_type != SHT_REL) {
7314 continue;
7315 }
7316@@ -474,13 +518,13 @@ static void print_absolute_relocs(void)
7317
7318 static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7319 {
7320- int i;
7321+ unsigned int i;
7322 /* Walk through the relocations */
7323 for (i = 0; i < ehdr.e_shnum; i++) {
7324 char *sym_strtab;
7325 Elf32_Sym *sh_symtab;
7326 struct section *sec_applies, *sec_symtab;
7327- int j;
7328+ unsigned int j;
7329 struct section *sec = &secs[i];
7330
7331 if (sec->shdr.sh_type != SHT_REL) {
7332@@ -504,6 +548,21 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7333 if (sym->st_shndx == SHN_ABS) {
7334 continue;
7335 }
7336+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
7337+ if (!strcmp(sec_name(sym->st_shndx), ".data.percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
7338+ continue;
7339+
7340+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
7341+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
7342+ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
7343+ continue;
7344+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
7345+ continue;
7346+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
7347+ continue;
7348+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
7349+ continue;
7350+#endif
7351 if (r_type == R_386_NONE || r_type == R_386_PC32) {
7352 /*
7353 * NONE can be ignored and and PC relative
7354@@ -541,7 +600,7 @@ static int cmp_relocs(const void *va, const void *vb)
7355
7356 static void emit_relocs(int as_text)
7357 {
7358- int i;
7359+ unsigned int i;
7360 /* Count how many relocations I have and allocate space for them. */
7361 reloc_count = 0;
7362 walk_relocs(count_reloc);
7363@@ -634,6 +693,7 @@ int main(int argc, char **argv)
7364 fname, strerror(errno));
7365 }
7366 read_ehdr(fp);
7367+ read_phdrs(fp);
7368 read_shdrs(fp);
7369 read_strtabs(fp);
7370 read_symtabs(fp);
7371diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
7372index 4d3ff03..e4972ff 100644
7373--- a/arch/x86/boot/cpucheck.c
7374+++ b/arch/x86/boot/cpucheck.c
7375@@ -74,7 +74,7 @@ static int has_fpu(void)
7376 u16 fcw = -1, fsw = -1;
7377 u32 cr0;
7378
7379- asm("movl %%cr0,%0" : "=r" (cr0));
7380+ asm volatile("movl %%cr0,%0" : "=r" (cr0));
7381 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
7382 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
7383 asm volatile("movl %0,%%cr0" : : "r" (cr0));
7384@@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
7385 {
7386 u32 f0, f1;
7387
7388- asm("pushfl ; "
7389+ asm volatile("pushfl ; "
7390 "pushfl ; "
7391 "popl %0 ; "
7392 "movl %0,%1 ; "
7393@@ -115,7 +115,7 @@ static void get_flags(void)
7394 set_bit(X86_FEATURE_FPU, cpu.flags);
7395
7396 if (has_eflag(X86_EFLAGS_ID)) {
7397- asm("cpuid"
7398+ asm volatile("cpuid"
7399 : "=a" (max_intel_level),
7400 "=b" (cpu_vendor[0]),
7401 "=d" (cpu_vendor[1]),
7402@@ -124,7 +124,7 @@ static void get_flags(void)
7403
7404 if (max_intel_level >= 0x00000001 &&
7405 max_intel_level <= 0x0000ffff) {
7406- asm("cpuid"
7407+ asm volatile("cpuid"
7408 : "=a" (tfms),
7409 "=c" (cpu.flags[4]),
7410 "=d" (cpu.flags[0])
7411@@ -136,7 +136,7 @@ static void get_flags(void)
7412 cpu.model += ((tfms >> 16) & 0xf) << 4;
7413 }
7414
7415- asm("cpuid"
7416+ asm volatile("cpuid"
7417 : "=a" (max_amd_level)
7418 : "a" (0x80000000)
7419 : "ebx", "ecx", "edx");
7420@@ -144,7 +144,7 @@ static void get_flags(void)
7421 if (max_amd_level >= 0x80000001 &&
7422 max_amd_level <= 0x8000ffff) {
7423 u32 eax = 0x80000001;
7424- asm("cpuid"
7425+ asm volatile("cpuid"
7426 : "+a" (eax),
7427 "=c" (cpu.flags[6]),
7428 "=d" (cpu.flags[1])
7429@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7430 u32 ecx = MSR_K7_HWCR;
7431 u32 eax, edx;
7432
7433- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7434+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7435 eax &= ~(1 << 15);
7436- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7437+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7438
7439 get_flags(); /* Make sure it really did something */
7440 err = check_flags();
7441@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7442 u32 ecx = MSR_VIA_FCR;
7443 u32 eax, edx;
7444
7445- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7446+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7447 eax |= (1<<1)|(1<<7);
7448- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7449+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7450
7451 set_bit(X86_FEATURE_CX8, cpu.flags);
7452 err = check_flags();
7453@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7454 u32 eax, edx;
7455 u32 level = 1;
7456
7457- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7458- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7459- asm("cpuid"
7460+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7461+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7462+ asm volatile("cpuid"
7463 : "+a" (level), "=d" (cpu.flags[0])
7464 : : "ecx", "ebx");
7465- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7466+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7467
7468 err = check_flags();
7469 }
7470diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
7471index b31cc54..8d69237 100644
7472--- a/arch/x86/boot/header.S
7473+++ b/arch/x86/boot/header.S
7474@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical pointer to
7475 # single linked list of
7476 # struct setup_data
7477
7478-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
7479+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
7480
7481 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
7482 #define VO_INIT_SIZE (VO__end - VO__text)
7483diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
7484index cae3feb..ff8ff2a 100644
7485--- a/arch/x86/boot/memory.c
7486+++ b/arch/x86/boot/memory.c
7487@@ -19,7 +19,7 @@
7488
7489 static int detect_memory_e820(void)
7490 {
7491- int count = 0;
7492+ unsigned int count = 0;
7493 struct biosregs ireg, oreg;
7494 struct e820entry *desc = boot_params.e820_map;
7495 static struct e820entry buf; /* static so it is zeroed */
7496diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
7497index 11e8c6e..fdbb1ed 100644
7498--- a/arch/x86/boot/video-vesa.c
7499+++ b/arch/x86/boot/video-vesa.c
7500@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
7501
7502 boot_params.screen_info.vesapm_seg = oreg.es;
7503 boot_params.screen_info.vesapm_off = oreg.di;
7504+ boot_params.screen_info.vesapm_size = oreg.cx;
7505 }
7506
7507 /*
7508diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
7509index d42da38..787cdf3 100644
7510--- a/arch/x86/boot/video.c
7511+++ b/arch/x86/boot/video.c
7512@@ -90,7 +90,7 @@ static void store_mode_params(void)
7513 static unsigned int get_entry(void)
7514 {
7515 char entry_buf[4];
7516- int i, len = 0;
7517+ unsigned int i, len = 0;
7518 int key;
7519 unsigned int v;
7520
7521diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
7522index 5b577d5..3c1fed4 100644
7523--- a/arch/x86/crypto/aes-x86_64-asm_64.S
7524+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
7525@@ -8,6 +8,8 @@
7526 * including this sentence is retained in full.
7527 */
7528
7529+#include <asm/alternative-asm.h>
7530+
7531 .extern crypto_ft_tab
7532 .extern crypto_it_tab
7533 .extern crypto_fl_tab
7534@@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
7535 je B192; \
7536 leaq 32(r9),r9;
7537
7538+#define ret pax_force_retaddr 0, 1; ret
7539+
7540 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
7541 movq r1,r2; \
7542 movq r3,r4; \
7543diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
7544index eb0566e..e3ebad8 100644
7545--- a/arch/x86/crypto/aesni-intel_asm.S
7546+++ b/arch/x86/crypto/aesni-intel_asm.S
7547@@ -16,6 +16,7 @@
7548 */
7549
7550 #include <linux/linkage.h>
7551+#include <asm/alternative-asm.h>
7552
7553 .text
7554
7555@@ -52,6 +53,7 @@ _key_expansion_256a:
7556 pxor %xmm1, %xmm0
7557 movaps %xmm0, (%rcx)
7558 add $0x10, %rcx
7559+ pax_force_retaddr_bts
7560 ret
7561
7562 _key_expansion_192a:
7563@@ -75,6 +77,7 @@ _key_expansion_192a:
7564 shufps $0b01001110, %xmm2, %xmm1
7565 movaps %xmm1, 16(%rcx)
7566 add $0x20, %rcx
7567+ pax_force_retaddr_bts
7568 ret
7569
7570 _key_expansion_192b:
7571@@ -93,6 +96,7 @@ _key_expansion_192b:
7572
7573 movaps %xmm0, (%rcx)
7574 add $0x10, %rcx
7575+ pax_force_retaddr_bts
7576 ret
7577
7578 _key_expansion_256b:
7579@@ -104,6 +108,7 @@ _key_expansion_256b:
7580 pxor %xmm1, %xmm2
7581 movaps %xmm2, (%rcx)
7582 add $0x10, %rcx
7583+ pax_force_retaddr_bts
7584 ret
7585
7586 /*
7587@@ -239,7 +244,9 @@ ENTRY(aesni_set_key)
7588 cmp %rcx, %rdi
7589 jb .Ldec_key_loop
7590 xor %rax, %rax
7591+ pax_force_retaddr 0, 1
7592 ret
7593+ENDPROC(aesni_set_key)
7594
7595 /*
7596 * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
7597@@ -249,7 +256,9 @@ ENTRY(aesni_enc)
7598 movups (INP), STATE # input
7599 call _aesni_enc1
7600 movups STATE, (OUTP) # output
7601+ pax_force_retaddr 0, 1
7602 ret
7603+ENDPROC(aesni_enc)
7604
7605 /*
7606 * _aesni_enc1: internal ABI
7607@@ -319,6 +328,7 @@ _aesni_enc1:
7608 movaps 0x70(TKEYP), KEY
7609 # aesenclast KEY, STATE # last round
7610 .byte 0x66, 0x0f, 0x38, 0xdd, 0xc2
7611+ pax_force_retaddr_bts
7612 ret
7613
7614 /*
7615@@ -482,6 +492,7 @@ _aesni_enc4:
7616 .byte 0x66, 0x0f, 0x38, 0xdd, 0xea
7617 # aesenclast KEY, STATE4
7618 .byte 0x66, 0x0f, 0x38, 0xdd, 0xf2
7619+ pax_force_retaddr_bts
7620 ret
7621
7622 /*
7623@@ -493,7 +504,9 @@ ENTRY(aesni_dec)
7624 movups (INP), STATE # input
7625 call _aesni_dec1
7626 movups STATE, (OUTP) #output
7627+ pax_force_retaddr 0, 1
7628 ret
7629+ENDPROC(aesni_dec)
7630
7631 /*
7632 * _aesni_dec1: internal ABI
7633@@ -563,6 +576,7 @@ _aesni_dec1:
7634 movaps 0x70(TKEYP), KEY
7635 # aesdeclast KEY, STATE # last round
7636 .byte 0x66, 0x0f, 0x38, 0xdf, 0xc2
7637+ pax_force_retaddr_bts
7638 ret
7639
7640 /*
7641@@ -726,6 +740,7 @@ _aesni_dec4:
7642 .byte 0x66, 0x0f, 0x38, 0xdf, 0xea
7643 # aesdeclast KEY, STATE4
7644 .byte 0x66, 0x0f, 0x38, 0xdf, 0xf2
7645+ pax_force_retaddr_bts
7646 ret
7647
7648 /*
7649@@ -769,7 +784,9 @@ ENTRY(aesni_ecb_enc)
7650 cmp $16, LEN
7651 jge .Lecb_enc_loop1
7652 .Lecb_enc_ret:
7653+ pax_force_retaddr 0, 1
7654 ret
7655+ENDPROC(aesni_ecb_enc)
7656
7657 /*
7658 * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7659@@ -813,7 +830,9 @@ ENTRY(aesni_ecb_dec)
7660 cmp $16, LEN
7661 jge .Lecb_dec_loop1
7662 .Lecb_dec_ret:
7663+ pax_force_retaddr 0, 1
7664 ret
7665+ENDPROC(aesni_ecb_dec)
7666
7667 /*
7668 * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7669@@ -837,7 +856,9 @@ ENTRY(aesni_cbc_enc)
7670 jge .Lcbc_enc_loop
7671 movups STATE, (IVP)
7672 .Lcbc_enc_ret:
7673+ pax_force_retaddr 0, 1
7674 ret
7675+ENDPROC(aesni_cbc_enc)
7676
7677 /*
7678 * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7679@@ -894,4 +915,6 @@ ENTRY(aesni_cbc_dec)
7680 .Lcbc_dec_ret:
7681 movups IV, (IVP)
7682 .Lcbc_dec_just_ret:
7683+ pax_force_retaddr 0, 1
7684 ret
7685+ENDPROC(aesni_cbc_dec)
7686diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7687index 6214a9b..1f4fc9a 100644
7688--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
7689+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7690@@ -1,3 +1,5 @@
7691+#include <asm/alternative-asm.h>
7692+
7693 # enter ECRYPT_encrypt_bytes
7694 .text
7695 .p2align 5
7696@@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
7697 add %r11,%rsp
7698 mov %rdi,%rax
7699 mov %rsi,%rdx
7700+ pax_force_retaddr 0, 1
7701 ret
7702 # bytesatleast65:
7703 ._bytesatleast65:
7704@@ -891,6 +894,7 @@ ECRYPT_keysetup:
7705 add %r11,%rsp
7706 mov %rdi,%rax
7707 mov %rsi,%rdx
7708+ pax_force_retaddr
7709 ret
7710 # enter ECRYPT_ivsetup
7711 .text
7712@@ -917,4 +921,5 @@ ECRYPT_ivsetup:
7713 add %r11,%rsp
7714 mov %rdi,%rax
7715 mov %rsi,%rdx
7716+ pax_force_retaddr
7717 ret
7718diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
7719index 35974a5..5662ae2 100644
7720--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
7721+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
7722@@ -21,6 +21,7 @@
7723 .text
7724
7725 #include <asm/asm-offsets.h>
7726+#include <asm/alternative-asm.h>
7727
7728 #define a_offset 0
7729 #define b_offset 4
7730@@ -269,6 +270,7 @@ twofish_enc_blk:
7731
7732 popq R1
7733 movq $1,%rax
7734+ pax_force_retaddr 0, 1
7735 ret
7736
7737 twofish_dec_blk:
7738@@ -321,4 +323,5 @@ twofish_dec_blk:
7739
7740 popq R1
7741 movq $1,%rax
7742+ pax_force_retaddr 0, 1
7743 ret
7744diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
7745index 14531ab..a89a0c0 100644
7746--- a/arch/x86/ia32/ia32_aout.c
7747+++ b/arch/x86/ia32/ia32_aout.c
7748@@ -169,6 +169,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
7749 unsigned long dump_start, dump_size;
7750 struct user32 dump;
7751
7752+ memset(&dump, 0, sizeof(dump));
7753+
7754 fs = get_fs();
7755 set_fs(KERNEL_DS);
7756 has_dumped = 1;
7757@@ -218,12 +220,6 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
7758 dump_size = dump.u_ssize << PAGE_SHIFT;
7759 DUMP_WRITE(dump_start, dump_size);
7760 }
7761- /*
7762- * Finally dump the task struct. Not be used by gdb, but
7763- * could be useful
7764- */
7765- set_fs(KERNEL_DS);
7766- DUMP_WRITE(current, sizeof(*current));
7767 end_coredump:
7768 set_fs(fs);
7769 return has_dumped;
7770diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
7771index 588a7aa..a3468b0 100644
7772--- a/arch/x86/ia32/ia32_signal.c
7773+++ b/arch/x86/ia32/ia32_signal.c
7774@@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
7775 }
7776 seg = get_fs();
7777 set_fs(KERNEL_DS);
7778- ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
7779+ ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
7780 set_fs(seg);
7781 if (ret >= 0 && uoss_ptr) {
7782 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
7783@@ -374,7 +374,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
7784 */
7785 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
7786 size_t frame_size,
7787- void **fpstate)
7788+ void __user **fpstate)
7789 {
7790 unsigned long sp;
7791
7792@@ -395,7 +395,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
7793
7794 if (used_math()) {
7795 sp = sp - sig_xstate_ia32_size;
7796- *fpstate = (struct _fpstate_ia32 *) sp;
7797+ *fpstate = (struct _fpstate_ia32 __user *) sp;
7798 if (save_i387_xstate_ia32(*fpstate) < 0)
7799 return (void __user *) -1L;
7800 }
7801@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
7802 sp -= frame_size;
7803 /* Align the stack pointer according to the i386 ABI,
7804 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
7805- sp = ((sp + 4) & -16ul) - 4;
7806+ sp = ((sp - 12) & -16ul) - 4;
7807 return (void __user *) sp;
7808 }
7809
7810@@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
7811 * These are actually not used anymore, but left because some
7812 * gdb versions depend on them as a marker.
7813 */
7814- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
7815+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
7816 } put_user_catch(err);
7817
7818 if (err)
7819@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
7820 0xb8,
7821 __NR_ia32_rt_sigreturn,
7822 0x80cd,
7823- 0,
7824+ 0
7825 };
7826
7827 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
7828@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
7829
7830 if (ka->sa.sa_flags & SA_RESTORER)
7831 restorer = ka->sa.sa_restorer;
7832+ else if (current->mm->context.vdso)
7833+ /* Return stub is in 32bit vsyscall page */
7834+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
7835 else
7836- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
7837- rt_sigreturn);
7838+ restorer = &frame->retcode;
7839 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
7840
7841 /*
7842 * Not actually used anymore, but left because some gdb
7843 * versions need it.
7844 */
7845- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
7846+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
7847 } put_user_catch(err);
7848
7849 if (err)
7850diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
7851index 4edd8eb..29124b4 100644
7852--- a/arch/x86/ia32/ia32entry.S
7853+++ b/arch/x86/ia32/ia32entry.S
7854@@ -13,7 +13,9 @@
7855 #include <asm/thread_info.h>
7856 #include <asm/segment.h>
7857 #include <asm/irqflags.h>
7858+#include <asm/pgtable.h>
7859 #include <linux/linkage.h>
7860+#include <asm/alternative-asm.h>
7861
7862 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
7863 #include <linux/elf-em.h>
7864@@ -93,6 +95,32 @@ ENTRY(native_irq_enable_sysexit)
7865 ENDPROC(native_irq_enable_sysexit)
7866 #endif
7867
7868+ .macro pax_enter_kernel_user
7869+ pax_set_fptr_mask
7870+#ifdef CONFIG_PAX_MEMORY_UDEREF
7871+ call pax_enter_kernel_user
7872+#endif
7873+ .endm
7874+
7875+ .macro pax_exit_kernel_user
7876+#ifdef CONFIG_PAX_MEMORY_UDEREF
7877+ call pax_exit_kernel_user
7878+#endif
7879+#ifdef CONFIG_PAX_RANDKSTACK
7880+ pushq %rax
7881+ pushq %r11
7882+ call pax_randomize_kstack
7883+ popq %r11
7884+ popq %rax
7885+#endif
7886+ .endm
7887+
7888+.macro pax_erase_kstack
7889+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
7890+ call pax_erase_kstack
7891+#endif
7892+.endm
7893+
7894 /*
7895 * 32bit SYSENTER instruction entry.
7896 *
7897@@ -119,12 +147,6 @@ ENTRY(ia32_sysenter_target)
7898 CFI_REGISTER rsp,rbp
7899 SWAPGS_UNSAFE_STACK
7900 movq PER_CPU_VAR(kernel_stack), %rsp
7901- addq $(KERNEL_STACK_OFFSET),%rsp
7902- /*
7903- * No need to follow this irqs on/off section: the syscall
7904- * disabled irqs, here we enable it straight after entry:
7905- */
7906- ENABLE_INTERRUPTS(CLBR_NONE)
7907 movl %ebp,%ebp /* zero extension */
7908 pushq $__USER32_DS
7909 CFI_ADJUST_CFA_OFFSET 8
7910@@ -135,28 +157,42 @@ ENTRY(ia32_sysenter_target)
7911 pushfq
7912 CFI_ADJUST_CFA_OFFSET 8
7913 /*CFI_REL_OFFSET rflags,0*/
7914- movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d
7915- CFI_REGISTER rip,r10
7916+ orl $X86_EFLAGS_IF,(%rsp)
7917+ GET_THREAD_INFO(%r11)
7918+ movl TI_sysenter_return(%r11), %r11d
7919+ CFI_REGISTER rip,r11
7920 pushq $__USER32_CS
7921 CFI_ADJUST_CFA_OFFSET 8
7922 /*CFI_REL_OFFSET cs,0*/
7923 movl %eax, %eax
7924- pushq %r10
7925+ pushq %r11
7926 CFI_ADJUST_CFA_OFFSET 8
7927 CFI_REL_OFFSET rip,0
7928 pushq %rax
7929 CFI_ADJUST_CFA_OFFSET 8
7930 cld
7931 SAVE_ARGS 0,0,1
7932+ pax_enter_kernel_user
7933+ /*
7934+ * No need to follow this irqs on/off section: the syscall
7935+ * disabled irqs, here we enable it straight after entry:
7936+ */
7937+ ENABLE_INTERRUPTS(CLBR_NONE)
7938 /* no need to do an access_ok check here because rbp has been
7939 32bit zero extended */
7940+
7941+#ifdef CONFIG_PAX_MEMORY_UDEREF
7942+ mov $PAX_USER_SHADOW_BASE,%r11
7943+ add %r11,%rbp
7944+#endif
7945+
7946 1: movl (%rbp),%ebp
7947 .section __ex_table,"a"
7948 .quad 1b,ia32_badarg
7949 .previous
7950- GET_THREAD_INFO(%r10)
7951- orl $TS_COMPAT,TI_status(%r10)
7952- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
7953+ GET_THREAD_INFO(%r11)
7954+ orl $TS_COMPAT,TI_status(%r11)
7955+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
7956 CFI_REMEMBER_STATE
7957 jnz sysenter_tracesys
7958 cmpq $(IA32_NR_syscalls-1),%rax
7959@@ -166,13 +202,15 @@ sysenter_do_call:
7960 sysenter_dispatch:
7961 call *ia32_sys_call_table(,%rax,8)
7962 movq %rax,RAX-ARGOFFSET(%rsp)
7963- GET_THREAD_INFO(%r10)
7964+ GET_THREAD_INFO(%r11)
7965 DISABLE_INTERRUPTS(CLBR_NONE)
7966 TRACE_IRQS_OFF
7967- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
7968+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
7969 jnz sysexit_audit
7970 sysexit_from_sys_call:
7971- andl $~TS_COMPAT,TI_status(%r10)
7972+ pax_exit_kernel_user
7973+ pax_erase_kstack
7974+ andl $~TS_COMPAT,TI_status(%r11)
7975 /* clear IF, that popfq doesn't enable interrupts early */
7976 andl $~0x200,EFLAGS-R11(%rsp)
7977 movl RIP-R11(%rsp),%edx /* User %eip */
7978@@ -200,6 +238,9 @@ sysexit_from_sys_call:
7979 movl %eax,%esi /* 2nd arg: syscall number */
7980 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
7981 call audit_syscall_entry
7982+
7983+ pax_erase_kstack
7984+
7985 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
7986 cmpq $(IA32_NR_syscalls-1),%rax
7987 ja ia32_badsys
7988@@ -211,7 +252,7 @@ sysexit_from_sys_call:
7989 .endm
7990
7991 .macro auditsys_exit exit
7992- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
7993+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
7994 jnz ia32_ret_from_sys_call
7995 TRACE_IRQS_ON
7996 sti
7997@@ -221,12 +262,12 @@ sysexit_from_sys_call:
7998 movzbl %al,%edi /* zero-extend that into %edi */
7999 inc %edi /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */
8000 call audit_syscall_exit
8001- GET_THREAD_INFO(%r10)
8002+ GET_THREAD_INFO(%r11)
8003 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall return value */
8004 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
8005 cli
8006 TRACE_IRQS_OFF
8007- testl %edi,TI_flags(%r10)
8008+ testl %edi,TI_flags(%r11)
8009 jz \exit
8010 CLEAR_RREGS -ARGOFFSET
8011 jmp int_with_check
8012@@ -244,7 +285,7 @@ sysexit_audit:
8013
8014 sysenter_tracesys:
8015 #ifdef CONFIG_AUDITSYSCALL
8016- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8017+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8018 jz sysenter_auditsys
8019 #endif
8020 SAVE_REST
8021@@ -252,6 +293,9 @@ sysenter_tracesys:
8022 movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
8023 movq %rsp,%rdi /* &pt_regs -> arg1 */
8024 call syscall_trace_enter
8025+
8026+ pax_erase_kstack
8027+
8028 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8029 RESTORE_REST
8030 cmpq $(IA32_NR_syscalls-1),%rax
8031@@ -283,19 +327,20 @@ ENDPROC(ia32_sysenter_target)
8032 ENTRY(ia32_cstar_target)
8033 CFI_STARTPROC32 simple
8034 CFI_SIGNAL_FRAME
8035- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
8036+ CFI_DEF_CFA rsp,0
8037 CFI_REGISTER rip,rcx
8038 /*CFI_REGISTER rflags,r11*/
8039 SWAPGS_UNSAFE_STACK
8040 movl %esp,%r8d
8041 CFI_REGISTER rsp,r8
8042 movq PER_CPU_VAR(kernel_stack),%rsp
8043+ SAVE_ARGS 8*6,1,1
8044+ pax_enter_kernel_user
8045 /*
8046 * No need to follow this irqs on/off section: the syscall
8047 * disabled irqs and here we enable it straight after entry:
8048 */
8049 ENABLE_INTERRUPTS(CLBR_NONE)
8050- SAVE_ARGS 8,1,1
8051 movl %eax,%eax /* zero extension */
8052 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
8053 movq %rcx,RIP-ARGOFFSET(%rsp)
8054@@ -311,13 +356,19 @@ ENTRY(ia32_cstar_target)
8055 /* no need to do an access_ok check here because r8 has been
8056 32bit zero extended */
8057 /* hardware stack frame is complete now */
8058+
8059+#ifdef CONFIG_PAX_MEMORY_UDEREF
8060+ mov $PAX_USER_SHADOW_BASE,%r11
8061+ add %r11,%r8
8062+#endif
8063+
8064 1: movl (%r8),%r9d
8065 .section __ex_table,"a"
8066 .quad 1b,ia32_badarg
8067 .previous
8068- GET_THREAD_INFO(%r10)
8069- orl $TS_COMPAT,TI_status(%r10)
8070- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8071+ GET_THREAD_INFO(%r11)
8072+ orl $TS_COMPAT,TI_status(%r11)
8073+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8074 CFI_REMEMBER_STATE
8075 jnz cstar_tracesys
8076 cmpq $IA32_NR_syscalls-1,%rax
8077@@ -327,13 +378,15 @@ cstar_do_call:
8078 cstar_dispatch:
8079 call *ia32_sys_call_table(,%rax,8)
8080 movq %rax,RAX-ARGOFFSET(%rsp)
8081- GET_THREAD_INFO(%r10)
8082+ GET_THREAD_INFO(%r11)
8083 DISABLE_INTERRUPTS(CLBR_NONE)
8084 TRACE_IRQS_OFF
8085- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
8086+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8087 jnz sysretl_audit
8088 sysretl_from_sys_call:
8089- andl $~TS_COMPAT,TI_status(%r10)
8090+ pax_exit_kernel_user
8091+ pax_erase_kstack
8092+ andl $~TS_COMPAT,TI_status(%r11)
8093 RESTORE_ARGS 1,-ARG_SKIP,1,1,1
8094 movl RIP-ARGOFFSET(%rsp),%ecx
8095 CFI_REGISTER rip,rcx
8096@@ -361,7 +414,7 @@ sysretl_audit:
8097
8098 cstar_tracesys:
8099 #ifdef CONFIG_AUDITSYSCALL
8100- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8101+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8102 jz cstar_auditsys
8103 #endif
8104 xchgl %r9d,%ebp
8105@@ -370,6 +423,9 @@ cstar_tracesys:
8106 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8107 movq %rsp,%rdi /* &pt_regs -> arg1 */
8108 call syscall_trace_enter
8109+
8110+ pax_erase_kstack
8111+
8112 LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
8113 RESTORE_REST
8114 xchgl %ebp,%r9d
8115@@ -415,11 +471,6 @@ ENTRY(ia32_syscall)
8116 CFI_REL_OFFSET rip,RIP-RIP
8117 PARAVIRT_ADJUST_EXCEPTION_FRAME
8118 SWAPGS
8119- /*
8120- * No need to follow this irqs on/off section: the syscall
8121- * disabled irqs and here we enable it straight after entry:
8122- */
8123- ENABLE_INTERRUPTS(CLBR_NONE)
8124 movl %eax,%eax
8125 pushq %rax
8126 CFI_ADJUST_CFA_OFFSET 8
8127@@ -427,9 +478,15 @@ ENTRY(ia32_syscall)
8128 /* note the registers are not zero extended to the sf.
8129 this could be a problem. */
8130 SAVE_ARGS 0,0,1
8131- GET_THREAD_INFO(%r10)
8132- orl $TS_COMPAT,TI_status(%r10)
8133- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8134+ pax_enter_kernel_user
8135+ /*
8136+ * No need to follow this irqs on/off section: the syscall
8137+ * disabled irqs and here we enable it straight after entry:
8138+ */
8139+ ENABLE_INTERRUPTS(CLBR_NONE)
8140+ GET_THREAD_INFO(%r11)
8141+ orl $TS_COMPAT,TI_status(%r11)
8142+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8143 jnz ia32_tracesys
8144 cmpq $(IA32_NR_syscalls-1),%rax
8145 ja ia32_badsys
8146@@ -448,6 +505,9 @@ ia32_tracesys:
8147 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8148 movq %rsp,%rdi /* &pt_regs -> arg1 */
8149 call syscall_trace_enter
8150+
8151+ pax_erase_kstack
8152+
8153 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8154 RESTORE_REST
8155 cmpq $(IA32_NR_syscalls-1),%rax
8156@@ -462,6 +522,7 @@ ia32_badsys:
8157
8158 quiet_ni_syscall:
8159 movq $-ENOSYS,%rax
8160+ pax_force_retaddr
8161 ret
8162 CFI_ENDPROC
8163
8164diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
8165index 016218c..47ccbdd 100644
8166--- a/arch/x86/ia32/sys_ia32.c
8167+++ b/arch/x86/ia32/sys_ia32.c
8168@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
8169 */
8170 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
8171 {
8172- typeof(ubuf->st_uid) uid = 0;
8173- typeof(ubuf->st_gid) gid = 0;
8174+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
8175+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
8176 SET_UID(uid, stat->uid);
8177 SET_GID(gid, stat->gid);
8178 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
8179@@ -308,8 +308,8 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
8180 }
8181 set_fs(KERNEL_DS);
8182 ret = sys_rt_sigprocmask(how,
8183- set ? (sigset_t __user *)&s : NULL,
8184- oset ? (sigset_t __user *)&s : NULL,
8185+ set ? (sigset_t __force_user *)&s : NULL,
8186+ oset ? (sigset_t __force_user *)&s : NULL,
8187 sigsetsize);
8188 set_fs(old_fs);
8189 if (ret)
8190@@ -371,7 +371,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
8191 mm_segment_t old_fs = get_fs();
8192
8193 set_fs(KERNEL_DS);
8194- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
8195+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
8196 set_fs(old_fs);
8197 if (put_compat_timespec(&t, interval))
8198 return -EFAULT;
8199@@ -387,7 +387,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
8200 mm_segment_t old_fs = get_fs();
8201
8202 set_fs(KERNEL_DS);
8203- ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
8204+ ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
8205 set_fs(old_fs);
8206 if (!ret) {
8207 switch (_NSIG_WORDS) {
8208@@ -412,7 +412,7 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
8209 if (copy_siginfo_from_user32(&info, uinfo))
8210 return -EFAULT;
8211 set_fs(KERNEL_DS);
8212- ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
8213+ ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
8214 set_fs(old_fs);
8215 return ret;
8216 }
8217@@ -513,7 +513,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
8218 return -EFAULT;
8219
8220 set_fs(KERNEL_DS);
8221- ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
8222+ ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
8223 count);
8224 set_fs(old_fs);
8225
8226diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
8227index e2077d3..b7a8919 100644
8228--- a/arch/x86/include/asm/alternative-asm.h
8229+++ b/arch/x86/include/asm/alternative-asm.h
8230@@ -8,10 +8,10 @@
8231
8232 #ifdef CONFIG_SMP
8233 .macro LOCK_PREFIX
8234-1: lock
8235+672: lock
8236 .section .smp_locks,"a"
8237 .align 4
8238- X86_ALIGN 1b
8239+ X86_ALIGN 672b
8240 .previous
8241 .endm
8242 #else
8243@@ -19,4 +19,43 @@
8244 .endm
8245 #endif
8246
8247+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
8248+ .macro pax_force_retaddr_bts rip=0
8249+ btsq $63,\rip(%rsp)
8250+ .endm
8251+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
8252+ .macro pax_force_retaddr rip=0, reload=0
8253+ btsq $63,\rip(%rsp)
8254+ .endm
8255+ .macro pax_force_fptr ptr
8256+ btsq $63,\ptr
8257+ .endm
8258+ .macro pax_set_fptr_mask
8259+ .endm
8260+#endif
8261+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
8262+ .macro pax_force_retaddr rip=0, reload=0
8263+ .if \reload
8264+ pax_set_fptr_mask
8265+ .endif
8266+ orq %r10,\rip(%rsp)
8267+ .endm
8268+ .macro pax_force_fptr ptr
8269+ orq %r10,\ptr
8270+ .endm
8271+ .macro pax_set_fptr_mask
8272+ movabs $0x8000000000000000,%r10
8273+ .endm
8274+#endif
8275+#else
8276+ .macro pax_force_retaddr rip=0, reload=0
8277+ .endm
8278+ .macro pax_force_fptr ptr
8279+ .endm
8280+ .macro pax_force_retaddr_bts rip=0
8281+ .endm
8282+ .macro pax_set_fptr_mask
8283+ .endm
8284+#endif
8285+
8286 #endif /* __ASSEMBLY__ */
8287diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
8288index c240efc..fdfadf3 100644
8289--- a/arch/x86/include/asm/alternative.h
8290+++ b/arch/x86/include/asm/alternative.h
8291@@ -85,7 +85,7 @@ static inline void alternatives_smp_switch(int smp) {}
8292 " .byte 662b-661b\n" /* sourcelen */ \
8293 " .byte 664f-663f\n" /* replacementlen */ \
8294 ".previous\n" \
8295- ".section .altinstr_replacement, \"ax\"\n" \
8296+ ".section .altinstr_replacement, \"a\"\n" \
8297 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
8298 ".previous"
8299
8300diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
8301index 474d80d..1f97d58 100644
8302--- a/arch/x86/include/asm/apic.h
8303+++ b/arch/x86/include/asm/apic.h
8304@@ -46,7 +46,7 @@ static inline void generic_apic_probe(void)
8305
8306 #ifdef CONFIG_X86_LOCAL_APIC
8307
8308-extern unsigned int apic_verbosity;
8309+extern int apic_verbosity;
8310 extern int local_apic_timer_c2_ok;
8311
8312 extern int disable_apic;
8313diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
8314index 20370c6..a2eb9b0 100644
8315--- a/arch/x86/include/asm/apm.h
8316+++ b/arch/x86/include/asm/apm.h
8317@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
8318 __asm__ __volatile__(APM_DO_ZERO_SEGS
8319 "pushl %%edi\n\t"
8320 "pushl %%ebp\n\t"
8321- "lcall *%%cs:apm_bios_entry\n\t"
8322+ "lcall *%%ss:apm_bios_entry\n\t"
8323 "setc %%al\n\t"
8324 "popl %%ebp\n\t"
8325 "popl %%edi\n\t"
8326@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
8327 __asm__ __volatile__(APM_DO_ZERO_SEGS
8328 "pushl %%edi\n\t"
8329 "pushl %%ebp\n\t"
8330- "lcall *%%cs:apm_bios_entry\n\t"
8331+ "lcall *%%ss:apm_bios_entry\n\t"
8332 "setc %%bl\n\t"
8333 "popl %%ebp\n\t"
8334 "popl %%edi\n\t"
8335diff --git a/arch/x86/include/asm/atomic_32.h b/arch/x86/include/asm/atomic_32.h
8336index dc5a667..939040c 100644
8337--- a/arch/x86/include/asm/atomic_32.h
8338+++ b/arch/x86/include/asm/atomic_32.h
8339@@ -25,6 +25,17 @@ static inline int atomic_read(const atomic_t *v)
8340 }
8341
8342 /**
8343+ * atomic_read_unchecked - read atomic variable
8344+ * @v: pointer of type atomic_unchecked_t
8345+ *
8346+ * Atomically reads the value of @v.
8347+ */
8348+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
8349+{
8350+ return v->counter;
8351+}
8352+
8353+/**
8354 * atomic_set - set atomic variable
8355 * @v: pointer of type atomic_t
8356 * @i: required value
8357@@ -37,6 +48,18 @@ static inline void atomic_set(atomic_t *v, int i)
8358 }
8359
8360 /**
8361+ * atomic_set_unchecked - set atomic variable
8362+ * @v: pointer of type atomic_unchecked_t
8363+ * @i: required value
8364+ *
8365+ * Atomically sets the value of @v to @i.
8366+ */
8367+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
8368+{
8369+ v->counter = i;
8370+}
8371+
8372+/**
8373 * atomic_add - add integer to atomic variable
8374 * @i: integer value to add
8375 * @v: pointer of type atomic_t
8376@@ -45,7 +68,29 @@ static inline void atomic_set(atomic_t *v, int i)
8377 */
8378 static inline void atomic_add(int i, atomic_t *v)
8379 {
8380- asm volatile(LOCK_PREFIX "addl %1,%0"
8381+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8382+
8383+#ifdef CONFIG_PAX_REFCOUNT
8384+ "jno 0f\n"
8385+ LOCK_PREFIX "subl %1,%0\n"
8386+ "int $4\n0:\n"
8387+ _ASM_EXTABLE(0b, 0b)
8388+#endif
8389+
8390+ : "+m" (v->counter)
8391+ : "ir" (i));
8392+}
8393+
8394+/**
8395+ * atomic_add_unchecked - add integer to atomic variable
8396+ * @i: integer value to add
8397+ * @v: pointer of type atomic_unchecked_t
8398+ *
8399+ * Atomically adds @i to @v.
8400+ */
8401+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
8402+{
8403+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8404 : "+m" (v->counter)
8405 : "ir" (i));
8406 }
8407@@ -59,7 +104,29 @@ static inline void atomic_add(int i, atomic_t *v)
8408 */
8409 static inline void atomic_sub(int i, atomic_t *v)
8410 {
8411- asm volatile(LOCK_PREFIX "subl %1,%0"
8412+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8413+
8414+#ifdef CONFIG_PAX_REFCOUNT
8415+ "jno 0f\n"
8416+ LOCK_PREFIX "addl %1,%0\n"
8417+ "int $4\n0:\n"
8418+ _ASM_EXTABLE(0b, 0b)
8419+#endif
8420+
8421+ : "+m" (v->counter)
8422+ : "ir" (i));
8423+}
8424+
8425+/**
8426+ * atomic_sub_unchecked - subtract integer from atomic variable
8427+ * @i: integer value to subtract
8428+ * @v: pointer of type atomic_unchecked_t
8429+ *
8430+ * Atomically subtracts @i from @v.
8431+ */
8432+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
8433+{
8434+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8435 : "+m" (v->counter)
8436 : "ir" (i));
8437 }
8438@@ -77,7 +144,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8439 {
8440 unsigned char c;
8441
8442- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
8443+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
8444+
8445+#ifdef CONFIG_PAX_REFCOUNT
8446+ "jno 0f\n"
8447+ LOCK_PREFIX "addl %2,%0\n"
8448+ "int $4\n0:\n"
8449+ _ASM_EXTABLE(0b, 0b)
8450+#endif
8451+
8452+ "sete %1\n"
8453 : "+m" (v->counter), "=qm" (c)
8454 : "ir" (i) : "memory");
8455 return c;
8456@@ -91,7 +167,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8457 */
8458 static inline void atomic_inc(atomic_t *v)
8459 {
8460- asm volatile(LOCK_PREFIX "incl %0"
8461+ asm volatile(LOCK_PREFIX "incl %0\n"
8462+
8463+#ifdef CONFIG_PAX_REFCOUNT
8464+ "jno 0f\n"
8465+ LOCK_PREFIX "decl %0\n"
8466+ "int $4\n0:\n"
8467+ _ASM_EXTABLE(0b, 0b)
8468+#endif
8469+
8470+ : "+m" (v->counter));
8471+}
8472+
8473+/**
8474+ * atomic_inc_unchecked - increment atomic variable
8475+ * @v: pointer of type atomic_unchecked_t
8476+ *
8477+ * Atomically increments @v by 1.
8478+ */
8479+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
8480+{
8481+ asm volatile(LOCK_PREFIX "incl %0\n"
8482 : "+m" (v->counter));
8483 }
8484
8485@@ -103,7 +199,27 @@ static inline void atomic_inc(atomic_t *v)
8486 */
8487 static inline void atomic_dec(atomic_t *v)
8488 {
8489- asm volatile(LOCK_PREFIX "decl %0"
8490+ asm volatile(LOCK_PREFIX "decl %0\n"
8491+
8492+#ifdef CONFIG_PAX_REFCOUNT
8493+ "jno 0f\n"
8494+ LOCK_PREFIX "incl %0\n"
8495+ "int $4\n0:\n"
8496+ _ASM_EXTABLE(0b, 0b)
8497+#endif
8498+
8499+ : "+m" (v->counter));
8500+}
8501+
8502+/**
8503+ * atomic_dec_unchecked - decrement atomic variable
8504+ * @v: pointer of type atomic_unchecked_t
8505+ *
8506+ * Atomically decrements @v by 1.
8507+ */
8508+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
8509+{
8510+ asm volatile(LOCK_PREFIX "decl %0\n"
8511 : "+m" (v->counter));
8512 }
8513
8514@@ -119,7 +235,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
8515 {
8516 unsigned char c;
8517
8518- asm volatile(LOCK_PREFIX "decl %0; sete %1"
8519+ asm volatile(LOCK_PREFIX "decl %0\n"
8520+
8521+#ifdef CONFIG_PAX_REFCOUNT
8522+ "jno 0f\n"
8523+ LOCK_PREFIX "incl %0\n"
8524+ "int $4\n0:\n"
8525+ _ASM_EXTABLE(0b, 0b)
8526+#endif
8527+
8528+ "sete %1\n"
8529 : "+m" (v->counter), "=qm" (c)
8530 : : "memory");
8531 return c != 0;
8532@@ -137,7 +262,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
8533 {
8534 unsigned char c;
8535
8536- asm volatile(LOCK_PREFIX "incl %0; sete %1"
8537+ asm volatile(LOCK_PREFIX "incl %0\n"
8538+
8539+#ifdef CONFIG_PAX_REFCOUNT
8540+ "jno 0f\n"
8541+ LOCK_PREFIX "decl %0\n"
8542+ "into\n0:\n"
8543+ _ASM_EXTABLE(0b, 0b)
8544+#endif
8545+
8546+ "sete %1\n"
8547+ : "+m" (v->counter), "=qm" (c)
8548+ : : "memory");
8549+ return c != 0;
8550+}
8551+
8552+/**
8553+ * atomic_inc_and_test_unchecked - increment and test
8554+ * @v: pointer of type atomic_unchecked_t
8555+ *
8556+ * Atomically increments @v by 1
8557+ * and returns true if the result is zero, or false for all
8558+ * other cases.
8559+ */
8560+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
8561+{
8562+ unsigned char c;
8563+
8564+ asm volatile(LOCK_PREFIX "incl %0\n"
8565+ "sete %1\n"
8566 : "+m" (v->counter), "=qm" (c)
8567 : : "memory");
8568 return c != 0;
8569@@ -156,7 +309,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
8570 {
8571 unsigned char c;
8572
8573- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
8574+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
8575+
8576+#ifdef CONFIG_PAX_REFCOUNT
8577+ "jno 0f\n"
8578+ LOCK_PREFIX "subl %2,%0\n"
8579+ "int $4\n0:\n"
8580+ _ASM_EXTABLE(0b, 0b)
8581+#endif
8582+
8583+ "sets %1\n"
8584 : "+m" (v->counter), "=qm" (c)
8585 : "ir" (i) : "memory");
8586 return c;
8587@@ -179,7 +341,15 @@ static inline int atomic_add_return(int i, atomic_t *v)
8588 #endif
8589 /* Modern 486+ processor */
8590 __i = i;
8591- asm volatile(LOCK_PREFIX "xaddl %0, %1"
8592+ asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
8593+
8594+#ifdef CONFIG_PAX_REFCOUNT
8595+ "jno 0f\n"
8596+ "movl %0, %1\n"
8597+ "int $4\n0:\n"
8598+ _ASM_EXTABLE(0b, 0b)
8599+#endif
8600+
8601 : "+r" (i), "+m" (v->counter)
8602 : : "memory");
8603 return i + __i;
8604@@ -195,6 +365,38 @@ no_xadd: /* Legacy 386 processor */
8605 }
8606
8607 /**
8608+ * atomic_add_return_unchecked - add integer and return
8609+ * @v: pointer of type atomic_unchecked_t
8610+ * @i: integer value to add
8611+ *
8612+ * Atomically adds @i to @v and returns @i + @v
8613+ */
8614+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
8615+{
8616+ int __i;
8617+#ifdef CONFIG_M386
8618+ unsigned long flags;
8619+ if (unlikely(boot_cpu_data.x86 <= 3))
8620+ goto no_xadd;
8621+#endif
8622+ /* Modern 486+ processor */
8623+ __i = i;
8624+ asm volatile(LOCK_PREFIX "xaddl %0, %1"
8625+ : "+r" (i), "+m" (v->counter)
8626+ : : "memory");
8627+ return i + __i;
8628+
8629+#ifdef CONFIG_M386
8630+no_xadd: /* Legacy 386 processor */
8631+ local_irq_save(flags);
8632+ __i = atomic_read_unchecked(v);
8633+ atomic_set_unchecked(v, i + __i);
8634+ local_irq_restore(flags);
8635+ return i + __i;
8636+#endif
8637+}
8638+
8639+/**
8640 * atomic_sub_return - subtract integer and return
8641 * @v: pointer of type atomic_t
8642 * @i: integer value to subtract
8643@@ -211,11 +413,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
8644 return cmpxchg(&v->counter, old, new);
8645 }
8646
8647+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
8648+{
8649+ return cmpxchg(&v->counter, old, new);
8650+}
8651+
8652 static inline int atomic_xchg(atomic_t *v, int new)
8653 {
8654 return xchg(&v->counter, new);
8655 }
8656
8657+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
8658+{
8659+ return xchg(&v->counter, new);
8660+}
8661+
8662 /**
8663 * atomic_add_unless - add unless the number is already a given value
8664 * @v: pointer of type atomic_t
8665@@ -227,22 +439,39 @@ static inline int atomic_xchg(atomic_t *v, int new)
8666 */
8667 static inline int atomic_add_unless(atomic_t *v, int a, int u)
8668 {
8669- int c, old;
8670+ int c, old, new;
8671 c = atomic_read(v);
8672 for (;;) {
8673- if (unlikely(c == (u)))
8674+ if (unlikely(c == u))
8675 break;
8676- old = atomic_cmpxchg((v), c, c + (a));
8677+
8678+ asm volatile("addl %2,%0\n"
8679+
8680+#ifdef CONFIG_PAX_REFCOUNT
8681+ "jno 0f\n"
8682+ "subl %2,%0\n"
8683+ "int $4\n0:\n"
8684+ _ASM_EXTABLE(0b, 0b)
8685+#endif
8686+
8687+ : "=r" (new)
8688+ : "0" (c), "ir" (a));
8689+
8690+ old = atomic_cmpxchg(v, c, new);
8691 if (likely(old == c))
8692 break;
8693 c = old;
8694 }
8695- return c != (u);
8696+ return c != u;
8697 }
8698
8699 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
8700
8701 #define atomic_inc_return(v) (atomic_add_return(1, v))
8702+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
8703+{
8704+ return atomic_add_return_unchecked(1, v);
8705+}
8706 #define atomic_dec_return(v) (atomic_sub_return(1, v))
8707
8708 /* These are x86-specific, used by some header files */
8709@@ -266,9 +495,18 @@ typedef struct {
8710 u64 __aligned(8) counter;
8711 } atomic64_t;
8712
8713+#ifdef CONFIG_PAX_REFCOUNT
8714+typedef struct {
8715+ u64 __aligned(8) counter;
8716+} atomic64_unchecked_t;
8717+#else
8718+typedef atomic64_t atomic64_unchecked_t;
8719+#endif
8720+
8721 #define ATOMIC64_INIT(val) { (val) }
8722
8723 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
8724+extern u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old_val, u64 new_val);
8725
8726 /**
8727 * atomic64_xchg - xchg atomic64 variable
8728@@ -279,6 +517,7 @@ extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
8729 * the old value.
8730 */
8731 extern u64 atomic64_xchg(atomic64_t *ptr, u64 new_val);
8732+extern u64 atomic64_xchg_unchecked(atomic64_unchecked_t *ptr, u64 new_val);
8733
8734 /**
8735 * atomic64_set - set atomic64 variable
8736@@ -290,6 +529,15 @@ extern u64 atomic64_xchg(atomic64_t *ptr, u64 new_val);
8737 extern void atomic64_set(atomic64_t *ptr, u64 new_val);
8738
8739 /**
8740+ * atomic64_unchecked_set - set atomic64 variable
8741+ * @ptr: pointer to type atomic64_unchecked_t
8742+ * @new_val: value to assign
8743+ *
8744+ * Atomically sets the value of @ptr to @new_val.
8745+ */
8746+extern void atomic64_set_unchecked(atomic64_unchecked_t *ptr, u64 new_val);
8747+
8748+/**
8749 * atomic64_read - read atomic64 variable
8750 * @ptr: pointer to type atomic64_t
8751 *
8752@@ -317,7 +565,33 @@ static inline u64 atomic64_read(atomic64_t *ptr)
8753 return res;
8754 }
8755
8756-extern u64 atomic64_read(atomic64_t *ptr);
8757+/**
8758+ * atomic64_read_unchecked - read atomic64 variable
8759+ * @ptr: pointer to type atomic64_unchecked_t
8760+ *
8761+ * Atomically reads the value of @ptr and returns it.
8762+ */
8763+static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *ptr)
8764+{
8765+ u64 res;
8766+
8767+ /*
8768+ * Note, we inline this atomic64_unchecked_t primitive because
8769+ * it only clobbers EAX/EDX and leaves the others
8770+ * untouched. We also (somewhat subtly) rely on the
8771+ * fact that cmpxchg8b returns the current 64-bit value
8772+ * of the memory location we are touching:
8773+ */
8774+ asm volatile(
8775+ "mov %%ebx, %%eax\n\t"
8776+ "mov %%ecx, %%edx\n\t"
8777+ LOCK_PREFIX "cmpxchg8b %1\n"
8778+ : "=&A" (res)
8779+ : "m" (*ptr)
8780+ );
8781+
8782+ return res;
8783+}
8784
8785 /**
8786 * atomic64_add_return - add and return
8787@@ -332,8 +606,11 @@ extern u64 atomic64_add_return(u64 delta, atomic64_t *ptr);
8788 * Other variants with different arithmetic operators:
8789 */
8790 extern u64 atomic64_sub_return(u64 delta, atomic64_t *ptr);
8791+extern u64 atomic64_sub_return_unchecked(u64 delta, atomic64_unchecked_t *ptr);
8792 extern u64 atomic64_inc_return(atomic64_t *ptr);
8793+extern u64 atomic64_inc_return_unchecked(atomic64_unchecked_t *ptr);
8794 extern u64 atomic64_dec_return(atomic64_t *ptr);
8795+extern u64 atomic64_dec_return_unchecked(atomic64_unchecked_t *ptr);
8796
8797 /**
8798 * atomic64_add - add integer to atomic64 variable
8799@@ -345,6 +622,15 @@ extern u64 atomic64_dec_return(atomic64_t *ptr);
8800 extern void atomic64_add(u64 delta, atomic64_t *ptr);
8801
8802 /**
8803+ * atomic64_add_unchecked - add integer to atomic64 variable
8804+ * @delta: integer value to add
8805+ * @ptr: pointer to type atomic64_unchecked_t
8806+ *
8807+ * Atomically adds @delta to @ptr.
8808+ */
8809+extern void atomic64_add_unchecked(u64 delta, atomic64_unchecked_t *ptr);
8810+
8811+/**
8812 * atomic64_sub - subtract the atomic64 variable
8813 * @delta: integer value to subtract
8814 * @ptr: pointer to type atomic64_t
8815@@ -354,6 +640,15 @@ extern void atomic64_add(u64 delta, atomic64_t *ptr);
8816 extern void atomic64_sub(u64 delta, atomic64_t *ptr);
8817
8818 /**
8819+ * atomic64_sub_unchecked - subtract the atomic64 variable
8820+ * @delta: integer value to subtract
8821+ * @ptr: pointer to type atomic64_unchecked_t
8822+ *
8823+ * Atomically subtracts @delta from @ptr.
8824+ */
8825+extern void atomic64_sub_unchecked(u64 delta, atomic64_unchecked_t *ptr);
8826+
8827+/**
8828 * atomic64_sub_and_test - subtract value from variable and test result
8829 * @delta: integer value to subtract
8830 * @ptr: pointer to type atomic64_t
8831@@ -373,6 +668,14 @@ extern int atomic64_sub_and_test(u64 delta, atomic64_t *ptr);
8832 extern void atomic64_inc(atomic64_t *ptr);
8833
8834 /**
8835+ * atomic64_inc_unchecked - increment atomic64 variable
8836+ * @ptr: pointer to type atomic64_unchecked_t
8837+ *
8838+ * Atomically increments @ptr by 1.
8839+ */
8840+extern void atomic64_inc_unchecked(atomic64_unchecked_t *ptr);
8841+
8842+/**
8843 * atomic64_dec - decrement atomic64 variable
8844 * @ptr: pointer to type atomic64_t
8845 *
8846@@ -381,6 +684,14 @@ extern void atomic64_inc(atomic64_t *ptr);
8847 extern void atomic64_dec(atomic64_t *ptr);
8848
8849 /**
8850+ * atomic64_dec_unchecked - decrement atomic64 variable
8851+ * @ptr: pointer to type atomic64_unchecked_t
8852+ *
8853+ * Atomically decrements @ptr by 1.
8854+ */
8855+extern void atomic64_dec_unchecked(atomic64_unchecked_t *ptr);
8856+
8857+/**
8858 * atomic64_dec_and_test - decrement and test
8859 * @ptr: pointer to type atomic64_t
8860 *
8861diff --git a/arch/x86/include/asm/atomic_64.h b/arch/x86/include/asm/atomic_64.h
8862index d605dc2..fafd7bd 100644
8863--- a/arch/x86/include/asm/atomic_64.h
8864+++ b/arch/x86/include/asm/atomic_64.h
8865@@ -24,6 +24,17 @@ static inline int atomic_read(const atomic_t *v)
8866 }
8867
8868 /**
8869+ * atomic_read_unchecked - read atomic variable
8870+ * @v: pointer of type atomic_unchecked_t
8871+ *
8872+ * Atomically reads the value of @v.
8873+ */
8874+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
8875+{
8876+ return v->counter;
8877+}
8878+
8879+/**
8880 * atomic_set - set atomic variable
8881 * @v: pointer of type atomic_t
8882 * @i: required value
8883@@ -36,6 +47,18 @@ static inline void atomic_set(atomic_t *v, int i)
8884 }
8885
8886 /**
8887+ * atomic_set_unchecked - set atomic variable
8888+ * @v: pointer of type atomic_unchecked_t
8889+ * @i: required value
8890+ *
8891+ * Atomically sets the value of @v to @i.
8892+ */
8893+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
8894+{
8895+ v->counter = i;
8896+}
8897+
8898+/**
8899 * atomic_add - add integer to atomic variable
8900 * @i: integer value to add
8901 * @v: pointer of type atomic_t
8902@@ -44,7 +67,29 @@ static inline void atomic_set(atomic_t *v, int i)
8903 */
8904 static inline void atomic_add(int i, atomic_t *v)
8905 {
8906- asm volatile(LOCK_PREFIX "addl %1,%0"
8907+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8908+
8909+#ifdef CONFIG_PAX_REFCOUNT
8910+ "jno 0f\n"
8911+ LOCK_PREFIX "subl %1,%0\n"
8912+ "int $4\n0:\n"
8913+ _ASM_EXTABLE(0b, 0b)
8914+#endif
8915+
8916+ : "=m" (v->counter)
8917+ : "ir" (i), "m" (v->counter));
8918+}
8919+
8920+/**
8921+ * atomic_add_unchecked - add integer to atomic variable
8922+ * @i: integer value to add
8923+ * @v: pointer of type atomic_unchecked_t
8924+ *
8925+ * Atomically adds @i to @v.
8926+ */
8927+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
8928+{
8929+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8930 : "=m" (v->counter)
8931 : "ir" (i), "m" (v->counter));
8932 }
8933@@ -58,7 +103,29 @@ static inline void atomic_add(int i, atomic_t *v)
8934 */
8935 static inline void atomic_sub(int i, atomic_t *v)
8936 {
8937- asm volatile(LOCK_PREFIX "subl %1,%0"
8938+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8939+
8940+#ifdef CONFIG_PAX_REFCOUNT
8941+ "jno 0f\n"
8942+ LOCK_PREFIX "addl %1,%0\n"
8943+ "int $4\n0:\n"
8944+ _ASM_EXTABLE(0b, 0b)
8945+#endif
8946+
8947+ : "=m" (v->counter)
8948+ : "ir" (i), "m" (v->counter));
8949+}
8950+
8951+/**
8952+ * atomic_sub_unchecked - subtract the atomic variable
8953+ * @i: integer value to subtract
8954+ * @v: pointer of type atomic_unchecked_t
8955+ *
8956+ * Atomically subtracts @i from @v.
8957+ */
8958+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
8959+{
8960+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8961 : "=m" (v->counter)
8962 : "ir" (i), "m" (v->counter));
8963 }
8964@@ -76,7 +143,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8965 {
8966 unsigned char c;
8967
8968- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
8969+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
8970+
8971+#ifdef CONFIG_PAX_REFCOUNT
8972+ "jno 0f\n"
8973+ LOCK_PREFIX "addl %2,%0\n"
8974+ "int $4\n0:\n"
8975+ _ASM_EXTABLE(0b, 0b)
8976+#endif
8977+
8978+ "sete %1\n"
8979 : "=m" (v->counter), "=qm" (c)
8980 : "ir" (i), "m" (v->counter) : "memory");
8981 return c;
8982@@ -90,7 +166,28 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8983 */
8984 static inline void atomic_inc(atomic_t *v)
8985 {
8986- asm volatile(LOCK_PREFIX "incl %0"
8987+ asm volatile(LOCK_PREFIX "incl %0\n"
8988+
8989+#ifdef CONFIG_PAX_REFCOUNT
8990+ "jno 0f\n"
8991+ LOCK_PREFIX "decl %0\n"
8992+ "int $4\n0:\n"
8993+ _ASM_EXTABLE(0b, 0b)
8994+#endif
8995+
8996+ : "=m" (v->counter)
8997+ : "m" (v->counter));
8998+}
8999+
9000+/**
9001+ * atomic_inc_unchecked - increment atomic variable
9002+ * @v: pointer of type atomic_unchecked_t
9003+ *
9004+ * Atomically increments @v by 1.
9005+ */
9006+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9007+{
9008+ asm volatile(LOCK_PREFIX "incl %0\n"
9009 : "=m" (v->counter)
9010 : "m" (v->counter));
9011 }
9012@@ -103,7 +200,28 @@ static inline void atomic_inc(atomic_t *v)
9013 */
9014 static inline void atomic_dec(atomic_t *v)
9015 {
9016- asm volatile(LOCK_PREFIX "decl %0"
9017+ asm volatile(LOCK_PREFIX "decl %0\n"
9018+
9019+#ifdef CONFIG_PAX_REFCOUNT
9020+ "jno 0f\n"
9021+ LOCK_PREFIX "incl %0\n"
9022+ "int $4\n0:\n"
9023+ _ASM_EXTABLE(0b, 0b)
9024+#endif
9025+
9026+ : "=m" (v->counter)
9027+ : "m" (v->counter));
9028+}
9029+
9030+/**
9031+ * atomic_dec_unchecked - decrement atomic variable
9032+ * @v: pointer of type atomic_unchecked_t
9033+ *
9034+ * Atomically decrements @v by 1.
9035+ */
9036+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9037+{
9038+ asm volatile(LOCK_PREFIX "decl %0\n"
9039 : "=m" (v->counter)
9040 : "m" (v->counter));
9041 }
9042@@ -120,7 +238,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
9043 {
9044 unsigned char c;
9045
9046- asm volatile(LOCK_PREFIX "decl %0; sete %1"
9047+ asm volatile(LOCK_PREFIX "decl %0\n"
9048+
9049+#ifdef CONFIG_PAX_REFCOUNT
9050+ "jno 0f\n"
9051+ LOCK_PREFIX "incl %0\n"
9052+ "int $4\n0:\n"
9053+ _ASM_EXTABLE(0b, 0b)
9054+#endif
9055+
9056+ "sete %1\n"
9057 : "=m" (v->counter), "=qm" (c)
9058 : "m" (v->counter) : "memory");
9059 return c != 0;
9060@@ -138,7 +265,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
9061 {
9062 unsigned char c;
9063
9064- asm volatile(LOCK_PREFIX "incl %0; sete %1"
9065+ asm volatile(LOCK_PREFIX "incl %0\n"
9066+
9067+#ifdef CONFIG_PAX_REFCOUNT
9068+ "jno 0f\n"
9069+ LOCK_PREFIX "decl %0\n"
9070+ "int $4\n0:\n"
9071+ _ASM_EXTABLE(0b, 0b)
9072+#endif
9073+
9074+ "sete %1\n"
9075+ : "=m" (v->counter), "=qm" (c)
9076+ : "m" (v->counter) : "memory");
9077+ return c != 0;
9078+}
9079+
9080+/**
9081+ * atomic_inc_and_test_unchecked - increment and test
9082+ * @v: pointer of type atomic_unchecked_t
9083+ *
9084+ * Atomically increments @v by 1
9085+ * and returns true if the result is zero, or false for all
9086+ * other cases.
9087+ */
9088+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9089+{
9090+ unsigned char c;
9091+
9092+ asm volatile(LOCK_PREFIX "incl %0\n"
9093+ "sete %1\n"
9094 : "=m" (v->counter), "=qm" (c)
9095 : "m" (v->counter) : "memory");
9096 return c != 0;
9097@@ -157,7 +312,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
9098 {
9099 unsigned char c;
9100
9101- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
9102+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
9103+
9104+#ifdef CONFIG_PAX_REFCOUNT
9105+ "jno 0f\n"
9106+ LOCK_PREFIX "subl %2,%0\n"
9107+ "int $4\n0:\n"
9108+ _ASM_EXTABLE(0b, 0b)
9109+#endif
9110+
9111+ "sets %1\n"
9112 : "=m" (v->counter), "=qm" (c)
9113 : "ir" (i), "m" (v->counter) : "memory");
9114 return c;
9115@@ -173,7 +337,31 @@ static inline int atomic_add_negative(int i, atomic_t *v)
9116 static inline int atomic_add_return(int i, atomic_t *v)
9117 {
9118 int __i = i;
9119- asm volatile(LOCK_PREFIX "xaddl %0, %1"
9120+ asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
9121+
9122+#ifdef CONFIG_PAX_REFCOUNT
9123+ "jno 0f\n"
9124+ "movl %0, %1\n"
9125+ "int $4\n0:\n"
9126+ _ASM_EXTABLE(0b, 0b)
9127+#endif
9128+
9129+ : "+r" (i), "+m" (v->counter)
9130+ : : "memory");
9131+ return i + __i;
9132+}
9133+
9134+/**
9135+ * atomic_add_return_unchecked - add and return
9136+ * @i: integer value to add
9137+ * @v: pointer of type atomic_unchecked_t
9138+ *
9139+ * Atomically adds @i to @v and returns @i + @v
9140+ */
9141+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
9142+{
9143+ int __i = i;
9144+ asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
9145 : "+r" (i), "+m" (v->counter)
9146 : : "memory");
9147 return i + __i;
9148@@ -185,6 +373,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
9149 }
9150
9151 #define atomic_inc_return(v) (atomic_add_return(1, v))
9152+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9153+{
9154+ return atomic_add_return_unchecked(1, v);
9155+}
9156 #define atomic_dec_return(v) (atomic_sub_return(1, v))
9157
9158 /* The 64-bit atomic type */
9159@@ -204,6 +396,18 @@ static inline long atomic64_read(const atomic64_t *v)
9160 }
9161
9162 /**
9163+ * atomic64_read_unchecked - read atomic64 variable
9164+ * @v: pointer of type atomic64_unchecked_t
9165+ *
9166+ * Atomically reads the value of @v.
9167+ * Doesn't imply a read memory barrier.
9168+ */
9169+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9170+{
9171+ return v->counter;
9172+}
9173+
9174+/**
9175 * atomic64_set - set atomic64 variable
9176 * @v: pointer to type atomic64_t
9177 * @i: required value
9178@@ -216,6 +420,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
9179 }
9180
9181 /**
9182+ * atomic64_set_unchecked - set atomic64 variable
9183+ * @v: pointer to type atomic64_unchecked_t
9184+ * @i: required value
9185+ *
9186+ * Atomically sets the value of @v to @i.
9187+ */
9188+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9189+{
9190+ v->counter = i;
9191+}
9192+
9193+/**
9194 * atomic64_add - add integer to atomic64 variable
9195 * @i: integer value to add
9196 * @v: pointer to type atomic64_t
9197@@ -224,6 +440,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
9198 */
9199 static inline void atomic64_add(long i, atomic64_t *v)
9200 {
9201+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
9202+
9203+#ifdef CONFIG_PAX_REFCOUNT
9204+ "jno 0f\n"
9205+ LOCK_PREFIX "subq %1,%0\n"
9206+ "int $4\n0:\n"
9207+ _ASM_EXTABLE(0b, 0b)
9208+#endif
9209+
9210+ : "=m" (v->counter)
9211+ : "er" (i), "m" (v->counter));
9212+}
9213+
9214+/**
9215+ * atomic64_add_unchecked - add integer to atomic64 variable
9216+ * @i: integer value to add
9217+ * @v: pointer to type atomic64_unchecked_t
9218+ *
9219+ * Atomically adds @i to @v.
9220+ */
9221+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
9222+{
9223 asm volatile(LOCK_PREFIX "addq %1,%0"
9224 : "=m" (v->counter)
9225 : "er" (i), "m" (v->counter));
9226@@ -238,7 +476,15 @@ static inline void atomic64_add(long i, atomic64_t *v)
9227 */
9228 static inline void atomic64_sub(long i, atomic64_t *v)
9229 {
9230- asm volatile(LOCK_PREFIX "subq %1,%0"
9231+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
9232+
9233+#ifdef CONFIG_PAX_REFCOUNT
9234+ "jno 0f\n"
9235+ LOCK_PREFIX "addq %1,%0\n"
9236+ "int $4\n0:\n"
9237+ _ASM_EXTABLE(0b, 0b)
9238+#endif
9239+
9240 : "=m" (v->counter)
9241 : "er" (i), "m" (v->counter));
9242 }
9243@@ -256,7 +502,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9244 {
9245 unsigned char c;
9246
9247- asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
9248+ asm volatile(LOCK_PREFIX "subq %2,%0\n"
9249+
9250+#ifdef CONFIG_PAX_REFCOUNT
9251+ "jno 0f\n"
9252+ LOCK_PREFIX "addq %2,%0\n"
9253+ "int $4\n0:\n"
9254+ _ASM_EXTABLE(0b, 0b)
9255+#endif
9256+
9257+ "sete %1\n"
9258 : "=m" (v->counter), "=qm" (c)
9259 : "er" (i), "m" (v->counter) : "memory");
9260 return c;
9261@@ -270,6 +525,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9262 */
9263 static inline void atomic64_inc(atomic64_t *v)
9264 {
9265+ asm volatile(LOCK_PREFIX "incq %0\n"
9266+
9267+#ifdef CONFIG_PAX_REFCOUNT
9268+ "jno 0f\n"
9269+ LOCK_PREFIX "decq %0\n"
9270+ "int $4\n0:\n"
9271+ _ASM_EXTABLE(0b, 0b)
9272+#endif
9273+
9274+ : "=m" (v->counter)
9275+ : "m" (v->counter));
9276+}
9277+
9278+/**
9279+ * atomic64_inc_unchecked - increment atomic64 variable
9280+ * @v: pointer to type atomic64_unchecked_t
9281+ *
9282+ * Atomically increments @v by 1.
9283+ */
9284+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9285+{
9286 asm volatile(LOCK_PREFIX "incq %0"
9287 : "=m" (v->counter)
9288 : "m" (v->counter));
9289@@ -283,7 +559,28 @@ static inline void atomic64_inc(atomic64_t *v)
9290 */
9291 static inline void atomic64_dec(atomic64_t *v)
9292 {
9293- asm volatile(LOCK_PREFIX "decq %0"
9294+ asm volatile(LOCK_PREFIX "decq %0\n"
9295+
9296+#ifdef CONFIG_PAX_REFCOUNT
9297+ "jno 0f\n"
9298+ LOCK_PREFIX "incq %0\n"
9299+ "int $4\n0:\n"
9300+ _ASM_EXTABLE(0b, 0b)
9301+#endif
9302+
9303+ : "=m" (v->counter)
9304+ : "m" (v->counter));
9305+}
9306+
9307+/**
9308+ * atomic64_dec_unchecked - decrement atomic64 variable
9309+ * @v: pointer to type atomic64_t
9310+ *
9311+ * Atomically decrements @v by 1.
9312+ */
9313+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9314+{
9315+ asm volatile(LOCK_PREFIX "decq %0\n"
9316 : "=m" (v->counter)
9317 : "m" (v->counter));
9318 }
9319@@ -300,7 +597,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
9320 {
9321 unsigned char c;
9322
9323- asm volatile(LOCK_PREFIX "decq %0; sete %1"
9324+ asm volatile(LOCK_PREFIX "decq %0\n"
9325+
9326+#ifdef CONFIG_PAX_REFCOUNT
9327+ "jno 0f\n"
9328+ LOCK_PREFIX "incq %0\n"
9329+ "int $4\n0:\n"
9330+ _ASM_EXTABLE(0b, 0b)
9331+#endif
9332+
9333+ "sete %1\n"
9334 : "=m" (v->counter), "=qm" (c)
9335 : "m" (v->counter) : "memory");
9336 return c != 0;
9337@@ -318,7 +624,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
9338 {
9339 unsigned char c;
9340
9341- asm volatile(LOCK_PREFIX "incq %0; sete %1"
9342+ asm volatile(LOCK_PREFIX "incq %0\n"
9343+
9344+#ifdef CONFIG_PAX_REFCOUNT
9345+ "jno 0f\n"
9346+ LOCK_PREFIX "decq %0\n"
9347+ "int $4\n0:\n"
9348+ _ASM_EXTABLE(0b, 0b)
9349+#endif
9350+
9351+ "sete %1\n"
9352 : "=m" (v->counter), "=qm" (c)
9353 : "m" (v->counter) : "memory");
9354 return c != 0;
9355@@ -337,7 +652,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9356 {
9357 unsigned char c;
9358
9359- asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
9360+ asm volatile(LOCK_PREFIX "addq %2,%0\n"
9361+
9362+#ifdef CONFIG_PAX_REFCOUNT
9363+ "jno 0f\n"
9364+ LOCK_PREFIX "subq %2,%0\n"
9365+ "int $4\n0:\n"
9366+ _ASM_EXTABLE(0b, 0b)
9367+#endif
9368+
9369+ "sets %1\n"
9370 : "=m" (v->counter), "=qm" (c)
9371 : "er" (i), "m" (v->counter) : "memory");
9372 return c;
9373@@ -353,7 +677,31 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9374 static inline long atomic64_add_return(long i, atomic64_t *v)
9375 {
9376 long __i = i;
9377- asm volatile(LOCK_PREFIX "xaddq %0, %1;"
9378+ asm volatile(LOCK_PREFIX "xaddq %0, %1\n"
9379+
9380+#ifdef CONFIG_PAX_REFCOUNT
9381+ "jno 0f\n"
9382+ "movq %0, %1\n"
9383+ "int $4\n0:\n"
9384+ _ASM_EXTABLE(0b, 0b)
9385+#endif
9386+
9387+ : "+r" (i), "+m" (v->counter)
9388+ : : "memory");
9389+ return i + __i;
9390+}
9391+
9392+/**
9393+ * atomic64_add_return_unchecked - add and return
9394+ * @i: integer value to add
9395+ * @v: pointer to type atomic64_unchecked_t
9396+ *
9397+ * Atomically adds @i to @v and returns @i + @v
9398+ */
9399+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
9400+{
9401+ long __i = i;
9402+ asm volatile(LOCK_PREFIX "xaddq %0, %1"
9403 : "+r" (i), "+m" (v->counter)
9404 : : "memory");
9405 return i + __i;
9406@@ -365,6 +713,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
9407 }
9408
9409 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
9410+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9411+{
9412+ return atomic64_add_return_unchecked(1, v);
9413+}
9414 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
9415
9416 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9417@@ -372,21 +724,41 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9418 return cmpxchg(&v->counter, old, new);
9419 }
9420
9421+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
9422+{
9423+ return cmpxchg(&v->counter, old, new);
9424+}
9425+
9426 static inline long atomic64_xchg(atomic64_t *v, long new)
9427 {
9428 return xchg(&v->counter, new);
9429 }
9430
9431+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
9432+{
9433+ return xchg(&v->counter, new);
9434+}
9435+
9436 static inline long atomic_cmpxchg(atomic_t *v, int old, int new)
9437 {
9438 return cmpxchg(&v->counter, old, new);
9439 }
9440
9441+static inline long atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9442+{
9443+ return cmpxchg(&v->counter, old, new);
9444+}
9445+
9446 static inline long atomic_xchg(atomic_t *v, int new)
9447 {
9448 return xchg(&v->counter, new);
9449 }
9450
9451+static inline long atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9452+{
9453+ return xchg(&v->counter, new);
9454+}
9455+
9456 /**
9457 * atomic_add_unless - add unless the number is a given value
9458 * @v: pointer of type atomic_t
9459@@ -398,17 +770,30 @@ static inline long atomic_xchg(atomic_t *v, int new)
9460 */
9461 static inline int atomic_add_unless(atomic_t *v, int a, int u)
9462 {
9463- int c, old;
9464+ int c, old, new;
9465 c = atomic_read(v);
9466 for (;;) {
9467- if (unlikely(c == (u)))
9468+ if (unlikely(c == u))
9469 break;
9470- old = atomic_cmpxchg((v), c, c + (a));
9471+
9472+ asm volatile("addl %2,%0\n"
9473+
9474+#ifdef CONFIG_PAX_REFCOUNT
9475+ "jno 0f\n"
9476+ "subl %2,%0\n"
9477+ "int $4\n0:\n"
9478+ _ASM_EXTABLE(0b, 0b)
9479+#endif
9480+
9481+ : "=r" (new)
9482+ : "0" (c), "ir" (a));
9483+
9484+ old = atomic_cmpxchg(v, c, new);
9485 if (likely(old == c))
9486 break;
9487 c = old;
9488 }
9489- return c != (u);
9490+ return c != u;
9491 }
9492
9493 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
9494@@ -424,17 +809,30 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
9495 */
9496 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
9497 {
9498- long c, old;
9499+ long c, old, new;
9500 c = atomic64_read(v);
9501 for (;;) {
9502- if (unlikely(c == (u)))
9503+ if (unlikely(c == u))
9504 break;
9505- old = atomic64_cmpxchg((v), c, c + (a));
9506+
9507+ asm volatile("addq %2,%0\n"
9508+
9509+#ifdef CONFIG_PAX_REFCOUNT
9510+ "jno 0f\n"
9511+ "subq %2,%0\n"
9512+ "int $4\n0:\n"
9513+ _ASM_EXTABLE(0b, 0b)
9514+#endif
9515+
9516+ : "=r" (new)
9517+ : "0" (c), "er" (a));
9518+
9519+ old = atomic64_cmpxchg(v, c, new);
9520 if (likely(old == c))
9521 break;
9522 c = old;
9523 }
9524- return c != (u);
9525+ return c != u;
9526 }
9527
9528 /**
9529diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
9530index 02b47a6..d5c4b15 100644
9531--- a/arch/x86/include/asm/bitops.h
9532+++ b/arch/x86/include/asm/bitops.h
9533@@ -38,7 +38,7 @@
9534 * a mask operation on a byte.
9535 */
9536 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
9537-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
9538+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
9539 #define CONST_MASK(nr) (1 << ((nr) & 7))
9540
9541 /**
9542diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
9543index 7a10659..8bbf355 100644
9544--- a/arch/x86/include/asm/boot.h
9545+++ b/arch/x86/include/asm/boot.h
9546@@ -11,10 +11,15 @@
9547 #include <asm/pgtable_types.h>
9548
9549 /* Physical address where kernel should be loaded. */
9550-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9551+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9552 + (CONFIG_PHYSICAL_ALIGN - 1)) \
9553 & ~(CONFIG_PHYSICAL_ALIGN - 1))
9554
9555+#ifndef __ASSEMBLY__
9556+extern unsigned char __LOAD_PHYSICAL_ADDR[];
9557+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
9558+#endif
9559+
9560 /* Minimum kernel alignment, as a power of two */
9561 #ifdef CONFIG_X86_64
9562 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
9563diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
9564index 549860d..7d45f68 100644
9565--- a/arch/x86/include/asm/cache.h
9566+++ b/arch/x86/include/asm/cache.h
9567@@ -5,9 +5,10 @@
9568
9569 /* L1 cache line size */
9570 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
9571-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9572+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9573
9574 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
9575+#define __read_only __attribute__((__section__(".data.read_only")))
9576
9577 #ifdef CONFIG_X86_VSMP
9578 /* vSMP Internode cacheline shift */
9579diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
9580index b54f6af..5b376a6 100644
9581--- a/arch/x86/include/asm/cacheflush.h
9582+++ b/arch/x86/include/asm/cacheflush.h
9583@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
9584 static inline unsigned long get_page_memtype(struct page *pg)
9585 {
9586 if (!PageUncached(pg) && !PageWC(pg))
9587- return -1;
9588+ return ~0UL;
9589 else if (!PageUncached(pg) && PageWC(pg))
9590 return _PAGE_CACHE_WC;
9591 else if (PageUncached(pg) && !PageWC(pg))
9592@@ -85,7 +85,7 @@ static inline void set_page_memtype(struct page *pg, unsigned long memtype)
9593 SetPageWC(pg);
9594 break;
9595 default:
9596- case -1:
9597+ case ~0UL:
9598 ClearPageUncached(pg);
9599 ClearPageWC(pg);
9600 break;
9601diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
9602index 0e63c9a..ab8d972 100644
9603--- a/arch/x86/include/asm/calling.h
9604+++ b/arch/x86/include/asm/calling.h
9605@@ -52,32 +52,32 @@ For 32-bit we have the following conventions - kernel is built with
9606 * for assembly code:
9607 */
9608
9609-#define R15 0
9610-#define R14 8
9611-#define R13 16
9612-#define R12 24
9613-#define RBP 32
9614-#define RBX 40
9615+#define R15 (0)
9616+#define R14 (8)
9617+#define R13 (16)
9618+#define R12 (24)
9619+#define RBP (32)
9620+#define RBX (40)
9621
9622 /* arguments: interrupts/non tracing syscalls only save up to here: */
9623-#define R11 48
9624-#define R10 56
9625-#define R9 64
9626-#define R8 72
9627-#define RAX 80
9628-#define RCX 88
9629-#define RDX 96
9630-#define RSI 104
9631-#define RDI 112
9632-#define ORIG_RAX 120 /* + error_code */
9633+#define R11 (48)
9634+#define R10 (56)
9635+#define R9 (64)
9636+#define R8 (72)
9637+#define RAX (80)
9638+#define RCX (88)
9639+#define RDX (96)
9640+#define RSI (104)
9641+#define RDI (112)
9642+#define ORIG_RAX (120) /* + error_code */
9643 /* end of arguments */
9644
9645 /* cpu exception frame or undefined in case of fast syscall: */
9646-#define RIP 128
9647-#define CS 136
9648-#define EFLAGS 144
9649-#define RSP 152
9650-#define SS 160
9651+#define RIP (128)
9652+#define CS (136)
9653+#define EFLAGS (144)
9654+#define RSP (152)
9655+#define SS (160)
9656
9657 #define ARGOFFSET R11
9658 #define SWFRAME ORIG_RAX
9659diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
9660index 46fc474..b02b0f9 100644
9661--- a/arch/x86/include/asm/checksum_32.h
9662+++ b/arch/x86/include/asm/checksum_32.h
9663@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
9664 int len, __wsum sum,
9665 int *src_err_ptr, int *dst_err_ptr);
9666
9667+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
9668+ int len, __wsum sum,
9669+ int *src_err_ptr, int *dst_err_ptr);
9670+
9671+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
9672+ int len, __wsum sum,
9673+ int *src_err_ptr, int *dst_err_ptr);
9674+
9675 /*
9676 * Note: when you get a NULL pointer exception here this means someone
9677 * passed in an incorrect kernel address to one of these functions.
9678@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
9679 int *err_ptr)
9680 {
9681 might_sleep();
9682- return csum_partial_copy_generic((__force void *)src, dst,
9683+ return csum_partial_copy_generic_from_user((__force void *)src, dst,
9684 len, sum, err_ptr, NULL);
9685 }
9686
9687@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
9688 {
9689 might_sleep();
9690 if (access_ok(VERIFY_WRITE, dst, len))
9691- return csum_partial_copy_generic(src, (__force void *)dst,
9692+ return csum_partial_copy_generic_to_user(src, (__force void *)dst,
9693 len, sum, NULL, err_ptr);
9694
9695 if (len)
9696diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
9697index 617bd56..7b047a1 100644
9698--- a/arch/x86/include/asm/desc.h
9699+++ b/arch/x86/include/asm/desc.h
9700@@ -4,6 +4,7 @@
9701 #include <asm/desc_defs.h>
9702 #include <asm/ldt.h>
9703 #include <asm/mmu.h>
9704+#include <asm/pgtable.h>
9705 #include <linux/smp.h>
9706
9707 static inline void fill_ldt(struct desc_struct *desc,
9708@@ -15,6 +16,7 @@ static inline void fill_ldt(struct desc_struct *desc,
9709 desc->base1 = (info->base_addr & 0x00ff0000) >> 16;
9710 desc->type = (info->read_exec_only ^ 1) << 1;
9711 desc->type |= info->contents << 2;
9712+ desc->type |= info->seg_not_present ^ 1;
9713 desc->s = 1;
9714 desc->dpl = 0x3;
9715 desc->p = info->seg_not_present ^ 1;
9716@@ -31,16 +33,12 @@ static inline void fill_ldt(struct desc_struct *desc,
9717 }
9718
9719 extern struct desc_ptr idt_descr;
9720-extern gate_desc idt_table[];
9721-
9722-struct gdt_page {
9723- struct desc_struct gdt[GDT_ENTRIES];
9724-} __attribute__((aligned(PAGE_SIZE)));
9725-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
9726+extern gate_desc idt_table[256];
9727
9728+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
9729 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
9730 {
9731- return per_cpu(gdt_page, cpu).gdt;
9732+ return cpu_gdt_table[cpu];
9733 }
9734
9735 #ifdef CONFIG_X86_64
9736@@ -65,9 +63,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
9737 unsigned long base, unsigned dpl, unsigned flags,
9738 unsigned short seg)
9739 {
9740- gate->a = (seg << 16) | (base & 0xffff);
9741- gate->b = (base & 0xffff0000) |
9742- (((0x80 | type | (dpl << 5)) & 0xff) << 8);
9743+ gate->gate.offset_low = base;
9744+ gate->gate.seg = seg;
9745+ gate->gate.reserved = 0;
9746+ gate->gate.type = type;
9747+ gate->gate.s = 0;
9748+ gate->gate.dpl = dpl;
9749+ gate->gate.p = 1;
9750+ gate->gate.offset_high = base >> 16;
9751 }
9752
9753 #endif
9754@@ -115,13 +118,17 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
9755 static inline void native_write_idt_entry(gate_desc *idt, int entry,
9756 const gate_desc *gate)
9757 {
9758+ pax_open_kernel();
9759 memcpy(&idt[entry], gate, sizeof(*gate));
9760+ pax_close_kernel();
9761 }
9762
9763 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry,
9764 const void *desc)
9765 {
9766+ pax_open_kernel();
9767 memcpy(&ldt[entry], desc, 8);
9768+ pax_close_kernel();
9769 }
9770
9771 static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry,
9772@@ -139,7 +146,10 @@ static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry,
9773 size = sizeof(struct desc_struct);
9774 break;
9775 }
9776+
9777+ pax_open_kernel();
9778 memcpy(&gdt[entry], desc, size);
9779+ pax_close_kernel();
9780 }
9781
9782 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
9783@@ -211,7 +221,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
9784
9785 static inline void native_load_tr_desc(void)
9786 {
9787+ pax_open_kernel();
9788 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
9789+ pax_close_kernel();
9790 }
9791
9792 static inline void native_load_gdt(const struct desc_ptr *dtr)
9793@@ -246,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
9794 unsigned int i;
9795 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
9796
9797+ pax_open_kernel();
9798 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
9799 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
9800+ pax_close_kernel();
9801 }
9802
9803 #define _LDT_empty(info) \
9804@@ -309,7 +323,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
9805 desc->limit = (limit >> 16) & 0xf;
9806 }
9807
9808-static inline void _set_gate(int gate, unsigned type, void *addr,
9809+static inline void _set_gate(int gate, unsigned type, const void *addr,
9810 unsigned dpl, unsigned ist, unsigned seg)
9811 {
9812 gate_desc s;
9813@@ -327,7 +341,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
9814 * Pentium F0 0F bugfix can have resulted in the mapped
9815 * IDT being write-protected.
9816 */
9817-static inline void set_intr_gate(unsigned int n, void *addr)
9818+static inline void set_intr_gate(unsigned int n, const void *addr)
9819 {
9820 BUG_ON((unsigned)n > 0xFF);
9821 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
9822@@ -356,19 +370,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
9823 /*
9824 * This routine sets up an interrupt gate at directory privilege level 3.
9825 */
9826-static inline void set_system_intr_gate(unsigned int n, void *addr)
9827+static inline void set_system_intr_gate(unsigned int n, const void *addr)
9828 {
9829 BUG_ON((unsigned)n > 0xFF);
9830 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
9831 }
9832
9833-static inline void set_system_trap_gate(unsigned int n, void *addr)
9834+static inline void set_system_trap_gate(unsigned int n, const void *addr)
9835 {
9836 BUG_ON((unsigned)n > 0xFF);
9837 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
9838 }
9839
9840-static inline void set_trap_gate(unsigned int n, void *addr)
9841+static inline void set_trap_gate(unsigned int n, const void *addr)
9842 {
9843 BUG_ON((unsigned)n > 0xFF);
9844 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
9845@@ -377,19 +391,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
9846 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
9847 {
9848 BUG_ON((unsigned)n > 0xFF);
9849- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
9850+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
9851 }
9852
9853-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
9854+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
9855 {
9856 BUG_ON((unsigned)n > 0xFF);
9857 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
9858 }
9859
9860-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
9861+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
9862 {
9863 BUG_ON((unsigned)n > 0xFF);
9864 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
9865 }
9866
9867+#ifdef CONFIG_X86_32
9868+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
9869+{
9870+ struct desc_struct d;
9871+
9872+ if (likely(limit))
9873+ limit = (limit - 1UL) >> PAGE_SHIFT;
9874+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
9875+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
9876+}
9877+#endif
9878+
9879 #endif /* _ASM_X86_DESC_H */
9880diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
9881index 9d66848..6b4a691 100644
9882--- a/arch/x86/include/asm/desc_defs.h
9883+++ b/arch/x86/include/asm/desc_defs.h
9884@@ -31,6 +31,12 @@ struct desc_struct {
9885 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
9886 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
9887 };
9888+ struct {
9889+ u16 offset_low;
9890+ u16 seg;
9891+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
9892+ unsigned offset_high: 16;
9893+ } gate;
9894 };
9895 } __attribute__((packed));
9896
9897diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h
9898index cee34e9..a7c3fa2 100644
9899--- a/arch/x86/include/asm/device.h
9900+++ b/arch/x86/include/asm/device.h
9901@@ -6,7 +6,7 @@ struct dev_archdata {
9902 void *acpi_handle;
9903 #endif
9904 #ifdef CONFIG_X86_64
9905-struct dma_map_ops *dma_ops;
9906+ const struct dma_map_ops *dma_ops;
9907 #endif
9908 #ifdef CONFIG_DMAR
9909 void *iommu; /* hook for IOMMU specific extension */
9910diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
9911index 6a25d5d..786b202 100644
9912--- a/arch/x86/include/asm/dma-mapping.h
9913+++ b/arch/x86/include/asm/dma-mapping.h
9914@@ -25,9 +25,9 @@ extern int iommu_merge;
9915 extern struct device x86_dma_fallback_dev;
9916 extern int panic_on_overflow;
9917
9918-extern struct dma_map_ops *dma_ops;
9919+extern const struct dma_map_ops *dma_ops;
9920
9921-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
9922+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
9923 {
9924 #ifdef CONFIG_X86_32
9925 return dma_ops;
9926@@ -44,7 +44,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
9927 /* Make sure we keep the same behaviour */
9928 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
9929 {
9930- struct dma_map_ops *ops = get_dma_ops(dev);
9931+ const struct dma_map_ops *ops = get_dma_ops(dev);
9932 if (ops->mapping_error)
9933 return ops->mapping_error(dev, dma_addr);
9934
9935@@ -122,7 +122,7 @@ static inline void *
9936 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
9937 gfp_t gfp)
9938 {
9939- struct dma_map_ops *ops = get_dma_ops(dev);
9940+ const struct dma_map_ops *ops = get_dma_ops(dev);
9941 void *memory;
9942
9943 gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
9944@@ -149,7 +149,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
9945 static inline void dma_free_coherent(struct device *dev, size_t size,
9946 void *vaddr, dma_addr_t bus)
9947 {
9948- struct dma_map_ops *ops = get_dma_ops(dev);
9949+ const struct dma_map_ops *ops = get_dma_ops(dev);
9950
9951 WARN_ON(irqs_disabled()); /* for portability */
9952
9953diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
9954index 40b4e61..40d8133 100644
9955--- a/arch/x86/include/asm/e820.h
9956+++ b/arch/x86/include/asm/e820.h
9957@@ -133,7 +133,7 @@ extern char *default_machine_specific_memory_setup(void);
9958 #define ISA_END_ADDRESS 0x100000
9959 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
9960
9961-#define BIOS_BEGIN 0x000a0000
9962+#define BIOS_BEGIN 0x000c0000
9963 #define BIOS_END 0x00100000
9964
9965 #ifdef __KERNEL__
9966diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
9967index 8ac9d9a..0a6c96e 100644
9968--- a/arch/x86/include/asm/elf.h
9969+++ b/arch/x86/include/asm/elf.h
9970@@ -257,7 +257,25 @@ extern int force_personality32;
9971 the loader. We need to make sure that it is out of the way of the program
9972 that it will "exec", and that there is sufficient room for the brk. */
9973
9974+#ifdef CONFIG_PAX_SEGMEXEC
9975+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
9976+#else
9977 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
9978+#endif
9979+
9980+#ifdef CONFIG_PAX_ASLR
9981+#ifdef CONFIG_X86_32
9982+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
9983+
9984+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9985+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9986+#else
9987+#define PAX_ELF_ET_DYN_BASE 0x400000UL
9988+
9989+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9990+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9991+#endif
9992+#endif
9993
9994 /* This yields a mask that user programs can use to figure out what
9995 instruction set this CPU supports. This could be done in user space,
9996@@ -310,9 +328,7 @@ do { \
9997
9998 #define ARCH_DLINFO \
9999 do { \
10000- if (vdso_enabled) \
10001- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
10002- (unsigned long)current->mm->context.vdso); \
10003+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
10004 } while (0)
10005
10006 #define AT_SYSINFO 32
10007@@ -323,7 +339,7 @@ do { \
10008
10009 #endif /* !CONFIG_X86_32 */
10010
10011-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
10012+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
10013
10014 #define VDSO_ENTRY \
10015 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
10016@@ -337,7 +353,4 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
10017 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
10018 #define compat_arch_setup_additional_pages syscall32_setup_pages
10019
10020-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
10021-#define arch_randomize_brk arch_randomize_brk
10022-
10023 #endif /* _ASM_X86_ELF_H */
10024diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
10025index cc70c1c..d96d011 100644
10026--- a/arch/x86/include/asm/emergency-restart.h
10027+++ b/arch/x86/include/asm/emergency-restart.h
10028@@ -15,6 +15,6 @@ enum reboot_type {
10029
10030 extern enum reboot_type reboot_type;
10031
10032-extern void machine_emergency_restart(void);
10033+extern void machine_emergency_restart(void) __noreturn;
10034
10035 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
10036diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
10037index 1f11ce4..7caabd1 100644
10038--- a/arch/x86/include/asm/futex.h
10039+++ b/arch/x86/include/asm/futex.h
10040@@ -12,16 +12,18 @@
10041 #include <asm/system.h>
10042
10043 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
10044+ typecheck(u32 __user *, uaddr); \
10045 asm volatile("1:\t" insn "\n" \
10046 "2:\t.section .fixup,\"ax\"\n" \
10047 "3:\tmov\t%3, %1\n" \
10048 "\tjmp\t2b\n" \
10049 "\t.previous\n" \
10050 _ASM_EXTABLE(1b, 3b) \
10051- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
10052+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
10053 : "i" (-EFAULT), "0" (oparg), "1" (0))
10054
10055 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
10056+ typecheck(u32 __user *, uaddr); \
10057 asm volatile("1:\tmovl %2, %0\n" \
10058 "\tmovl\t%0, %3\n" \
10059 "\t" insn "\n" \
10060@@ -34,10 +36,10 @@
10061 _ASM_EXTABLE(1b, 4b) \
10062 _ASM_EXTABLE(2b, 4b) \
10063 : "=&a" (oldval), "=&r" (ret), \
10064- "+m" (*uaddr), "=&r" (tem) \
10065+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
10066 : "r" (oparg), "i" (-EFAULT), "1" (0))
10067
10068-static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
10069+static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10070 {
10071 int op = (encoded_op >> 28) & 7;
10072 int cmp = (encoded_op >> 24) & 15;
10073@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
10074
10075 switch (op) {
10076 case FUTEX_OP_SET:
10077- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
10078+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
10079 break;
10080 case FUTEX_OP_ADD:
10081- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
10082+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
10083 uaddr, oparg);
10084 break;
10085 case FUTEX_OP_OR:
10086@@ -109,7 +111,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
10087 return ret;
10088 }
10089
10090-static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
10091+static inline int futex_atomic_cmpxchg_inatomic(u32 __user *uaddr, int oldval,
10092 int newval)
10093 {
10094
10095@@ -119,16 +121,16 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
10096 return -ENOSYS;
10097 #endif
10098
10099- if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
10100+ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
10101 return -EFAULT;
10102
10103- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
10104+ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %1\n"
10105 "2:\t.section .fixup, \"ax\"\n"
10106 "3:\tmov %2, %0\n"
10107 "\tjmp 2b\n"
10108 "\t.previous\n"
10109 _ASM_EXTABLE(1b, 3b)
10110- : "=a" (oldval), "+m" (*uaddr)
10111+ : "=a" (oldval), "+m" (*(u32 *)____m(uaddr))
10112 : "i" (-EFAULT), "r" (newval), "0" (oldval)
10113 : "memory"
10114 );
10115diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
10116index ba180d9..3bad351 100644
10117--- a/arch/x86/include/asm/hw_irq.h
10118+++ b/arch/x86/include/asm/hw_irq.h
10119@@ -92,8 +92,8 @@ extern void setup_ioapic_dest(void);
10120 extern void enable_IO_APIC(void);
10121
10122 /* Statistics */
10123-extern atomic_t irq_err_count;
10124-extern atomic_t irq_mis_count;
10125+extern atomic_unchecked_t irq_err_count;
10126+extern atomic_unchecked_t irq_mis_count;
10127
10128 /* EISA */
10129 extern void eisa_set_level_irq(unsigned int irq);
10130diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
10131index 0b20bbb..4cb1396 100644
10132--- a/arch/x86/include/asm/i387.h
10133+++ b/arch/x86/include/asm/i387.h
10134@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
10135 {
10136 int err;
10137
10138+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10139+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10140+ fx = (struct i387_fxsave_struct *)((void *)fx + PAX_USER_SHADOW_BASE);
10141+#endif
10142+
10143 asm volatile("1: rex64/fxrstor (%[fx])\n\t"
10144 "2:\n"
10145 ".section .fixup,\"ax\"\n"
10146@@ -105,6 +110,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
10147 {
10148 int err;
10149
10150+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10151+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10152+ fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
10153+#endif
10154+
10155 asm volatile("1: rex64/fxsave (%[fx])\n\t"
10156 "2:\n"
10157 ".section .fixup,\"ax\"\n"
10158@@ -195,13 +205,8 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
10159 }
10160
10161 /* We need a safe address that is cheap to find and that is already
10162- in L1 during context switch. The best choices are unfortunately
10163- different for UP and SMP */
10164-#ifdef CONFIG_SMP
10165-#define safe_address (__per_cpu_offset[0])
10166-#else
10167-#define safe_address (kstat_cpu(0).cpustat.user)
10168-#endif
10169+ in L1 during context switch. */
10170+#define safe_address (init_tss[smp_processor_id()].x86_tss.sp0)
10171
10172 /*
10173 * These must be called with preempt disabled
10174@@ -291,7 +296,7 @@ static inline void kernel_fpu_begin(void)
10175 struct thread_info *me = current_thread_info();
10176 preempt_disable();
10177 if (me->status & TS_USEDFPU)
10178- __save_init_fpu(me->task);
10179+ __save_init_fpu(current);
10180 else
10181 clts();
10182 }
10183diff --git a/arch/x86/include/asm/io_32.h b/arch/x86/include/asm/io_32.h
10184index a299900..15c5410 100644
10185--- a/arch/x86/include/asm/io_32.h
10186+++ b/arch/x86/include/asm/io_32.h
10187@@ -3,6 +3,7 @@
10188
10189 #include <linux/string.h>
10190 #include <linux/compiler.h>
10191+#include <asm/processor.h>
10192
10193 /*
10194 * This file contains the definitions for the x86 IO instructions
10195@@ -42,6 +43,17 @@
10196
10197 #ifdef __KERNEL__
10198
10199+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
10200+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
10201+{
10202+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10203+}
10204+
10205+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
10206+{
10207+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10208+}
10209+
10210 #include <asm-generic/iomap.h>
10211
10212 #include <linux/vmalloc.h>
10213diff --git a/arch/x86/include/asm/io_64.h b/arch/x86/include/asm/io_64.h
10214index 2440678..c158b88 100644
10215--- a/arch/x86/include/asm/io_64.h
10216+++ b/arch/x86/include/asm/io_64.h
10217@@ -140,6 +140,17 @@ __OUTS(l)
10218
10219 #include <linux/vmalloc.h>
10220
10221+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
10222+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
10223+{
10224+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10225+}
10226+
10227+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
10228+{
10229+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10230+}
10231+
10232 #include <asm-generic/iomap.h>
10233
10234 void __memcpy_fromio(void *, unsigned long, unsigned);
10235diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h
10236index fd6d21b..8b13915 100644
10237--- a/arch/x86/include/asm/iommu.h
10238+++ b/arch/x86/include/asm/iommu.h
10239@@ -3,7 +3,7 @@
10240
10241 extern void pci_iommu_shutdown(void);
10242 extern void no_iommu_init(void);
10243-extern struct dma_map_ops nommu_dma_ops;
10244+extern const struct dma_map_ops nommu_dma_ops;
10245 extern int force_iommu, no_iommu;
10246 extern int iommu_detected;
10247 extern int iommu_pass_through;
10248diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
10249index 9e2b952..557206e 100644
10250--- a/arch/x86/include/asm/irqflags.h
10251+++ b/arch/x86/include/asm/irqflags.h
10252@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_irq_save(void)
10253 sti; \
10254 sysexit
10255
10256+#define GET_CR0_INTO_RDI mov %cr0, %rdi
10257+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
10258+#define GET_CR3_INTO_RDI mov %cr3, %rdi
10259+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
10260+
10261 #else
10262 #define INTERRUPT_RETURN iret
10263 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
10264diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
10265index 4fe681d..bb6d40c 100644
10266--- a/arch/x86/include/asm/kprobes.h
10267+++ b/arch/x86/include/asm/kprobes.h
10268@@ -34,13 +34,8 @@ typedef u8 kprobe_opcode_t;
10269 #define BREAKPOINT_INSTRUCTION 0xcc
10270 #define RELATIVEJUMP_INSTRUCTION 0xe9
10271 #define MAX_INSN_SIZE 16
10272-#define MAX_STACK_SIZE 64
10273-#define MIN_STACK_SIZE(ADDR) \
10274- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
10275- THREAD_SIZE - (unsigned long)(ADDR))) \
10276- ? (MAX_STACK_SIZE) \
10277- : (((unsigned long)current_thread_info()) + \
10278- THREAD_SIZE - (unsigned long)(ADDR)))
10279+#define MAX_STACK_SIZE 64UL
10280+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
10281
10282 #define flush_insn_slot(p) do { } while (0)
10283
10284diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
10285index 08bc2ff..2e88d1f 100644
10286--- a/arch/x86/include/asm/kvm_host.h
10287+++ b/arch/x86/include/asm/kvm_host.h
10288@@ -534,9 +534,9 @@ struct kvm_x86_ops {
10289 bool (*gb_page_enable)(void);
10290
10291 const struct trace_print_flags *exit_reasons_str;
10292-};
10293+} __do_const;
10294
10295-extern struct kvm_x86_ops *kvm_x86_ops;
10296+extern const struct kvm_x86_ops *kvm_x86_ops;
10297
10298 int kvm_mmu_module_init(void);
10299 void kvm_mmu_module_exit(void);
10300diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
10301index 47b9b6f..815aaa1 100644
10302--- a/arch/x86/include/asm/local.h
10303+++ b/arch/x86/include/asm/local.h
10304@@ -18,26 +18,58 @@ typedef struct {
10305
10306 static inline void local_inc(local_t *l)
10307 {
10308- asm volatile(_ASM_INC "%0"
10309+ asm volatile(_ASM_INC "%0\n"
10310+
10311+#ifdef CONFIG_PAX_REFCOUNT
10312+ "jno 0f\n"
10313+ _ASM_DEC "%0\n"
10314+ "int $4\n0:\n"
10315+ _ASM_EXTABLE(0b, 0b)
10316+#endif
10317+
10318 : "+m" (l->a.counter));
10319 }
10320
10321 static inline void local_dec(local_t *l)
10322 {
10323- asm volatile(_ASM_DEC "%0"
10324+ asm volatile(_ASM_DEC "%0\n"
10325+
10326+#ifdef CONFIG_PAX_REFCOUNT
10327+ "jno 0f\n"
10328+ _ASM_INC "%0\n"
10329+ "int $4\n0:\n"
10330+ _ASM_EXTABLE(0b, 0b)
10331+#endif
10332+
10333 : "+m" (l->a.counter));
10334 }
10335
10336 static inline void local_add(long i, local_t *l)
10337 {
10338- asm volatile(_ASM_ADD "%1,%0"
10339+ asm volatile(_ASM_ADD "%1,%0\n"
10340+
10341+#ifdef CONFIG_PAX_REFCOUNT
10342+ "jno 0f\n"
10343+ _ASM_SUB "%1,%0\n"
10344+ "int $4\n0:\n"
10345+ _ASM_EXTABLE(0b, 0b)
10346+#endif
10347+
10348 : "+m" (l->a.counter)
10349 : "ir" (i));
10350 }
10351
10352 static inline void local_sub(long i, local_t *l)
10353 {
10354- asm volatile(_ASM_SUB "%1,%0"
10355+ asm volatile(_ASM_SUB "%1,%0\n"
10356+
10357+#ifdef CONFIG_PAX_REFCOUNT
10358+ "jno 0f\n"
10359+ _ASM_ADD "%1,%0\n"
10360+ "int $4\n0:\n"
10361+ _ASM_EXTABLE(0b, 0b)
10362+#endif
10363+
10364 : "+m" (l->a.counter)
10365 : "ir" (i));
10366 }
10367@@ -55,7 +87,16 @@ static inline int local_sub_and_test(long i, local_t *l)
10368 {
10369 unsigned char c;
10370
10371- asm volatile(_ASM_SUB "%2,%0; sete %1"
10372+ asm volatile(_ASM_SUB "%2,%0\n"
10373+
10374+#ifdef CONFIG_PAX_REFCOUNT
10375+ "jno 0f\n"
10376+ _ASM_ADD "%2,%0\n"
10377+ "int $4\n0:\n"
10378+ _ASM_EXTABLE(0b, 0b)
10379+#endif
10380+
10381+ "sete %1\n"
10382 : "+m" (l->a.counter), "=qm" (c)
10383 : "ir" (i) : "memory");
10384 return c;
10385@@ -73,7 +114,16 @@ static inline int local_dec_and_test(local_t *l)
10386 {
10387 unsigned char c;
10388
10389- asm volatile(_ASM_DEC "%0; sete %1"
10390+ asm volatile(_ASM_DEC "%0\n"
10391+
10392+#ifdef CONFIG_PAX_REFCOUNT
10393+ "jno 0f\n"
10394+ _ASM_INC "%0\n"
10395+ "int $4\n0:\n"
10396+ _ASM_EXTABLE(0b, 0b)
10397+#endif
10398+
10399+ "sete %1\n"
10400 : "+m" (l->a.counter), "=qm" (c)
10401 : : "memory");
10402 return c != 0;
10403@@ -91,7 +141,16 @@ static inline int local_inc_and_test(local_t *l)
10404 {
10405 unsigned char c;
10406
10407- asm volatile(_ASM_INC "%0; sete %1"
10408+ asm volatile(_ASM_INC "%0\n"
10409+
10410+#ifdef CONFIG_PAX_REFCOUNT
10411+ "jno 0f\n"
10412+ _ASM_DEC "%0\n"
10413+ "int $4\n0:\n"
10414+ _ASM_EXTABLE(0b, 0b)
10415+#endif
10416+
10417+ "sete %1\n"
10418 : "+m" (l->a.counter), "=qm" (c)
10419 : : "memory");
10420 return c != 0;
10421@@ -110,7 +169,16 @@ static inline int local_add_negative(long i, local_t *l)
10422 {
10423 unsigned char c;
10424
10425- asm volatile(_ASM_ADD "%2,%0; sets %1"
10426+ asm volatile(_ASM_ADD "%2,%0\n"
10427+
10428+#ifdef CONFIG_PAX_REFCOUNT
10429+ "jno 0f\n"
10430+ _ASM_SUB "%2,%0\n"
10431+ "int $4\n0:\n"
10432+ _ASM_EXTABLE(0b, 0b)
10433+#endif
10434+
10435+ "sets %1\n"
10436 : "+m" (l->a.counter), "=qm" (c)
10437 : "ir" (i) : "memory");
10438 return c;
10439@@ -133,7 +201,15 @@ static inline long local_add_return(long i, local_t *l)
10440 #endif
10441 /* Modern 486+ processor */
10442 __i = i;
10443- asm volatile(_ASM_XADD "%0, %1;"
10444+ asm volatile(_ASM_XADD "%0, %1\n"
10445+
10446+#ifdef CONFIG_PAX_REFCOUNT
10447+ "jno 0f\n"
10448+ _ASM_MOV "%0,%1\n"
10449+ "int $4\n0:\n"
10450+ _ASM_EXTABLE(0b, 0b)
10451+#endif
10452+
10453 : "+r" (i), "+m" (l->a.counter)
10454 : : "memory");
10455 return i + __i;
10456diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
10457index ef51b50..514ba37 100644
10458--- a/arch/x86/include/asm/microcode.h
10459+++ b/arch/x86/include/asm/microcode.h
10460@@ -12,13 +12,13 @@ struct device;
10461 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
10462
10463 struct microcode_ops {
10464- enum ucode_state (*request_microcode_user) (int cpu,
10465+ enum ucode_state (* const request_microcode_user) (int cpu,
10466 const void __user *buf, size_t size);
10467
10468- enum ucode_state (*request_microcode_fw) (int cpu,
10469+ enum ucode_state (* const request_microcode_fw) (int cpu,
10470 struct device *device);
10471
10472- void (*microcode_fini_cpu) (int cpu);
10473+ void (* const microcode_fini_cpu) (int cpu);
10474
10475 /*
10476 * The generic 'microcode_core' part guarantees that
10477@@ -38,18 +38,18 @@ struct ucode_cpu_info {
10478 extern struct ucode_cpu_info ucode_cpu_info[];
10479
10480 #ifdef CONFIG_MICROCODE_INTEL
10481-extern struct microcode_ops * __init init_intel_microcode(void);
10482+extern const struct microcode_ops * __init init_intel_microcode(void);
10483 #else
10484-static inline struct microcode_ops * __init init_intel_microcode(void)
10485+static inline const struct microcode_ops * __init init_intel_microcode(void)
10486 {
10487 return NULL;
10488 }
10489 #endif /* CONFIG_MICROCODE_INTEL */
10490
10491 #ifdef CONFIG_MICROCODE_AMD
10492-extern struct microcode_ops * __init init_amd_microcode(void);
10493+extern const struct microcode_ops * __init init_amd_microcode(void);
10494 #else
10495-static inline struct microcode_ops * __init init_amd_microcode(void)
10496+static inline const struct microcode_ops * __init init_amd_microcode(void)
10497 {
10498 return NULL;
10499 }
10500diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
10501index 593e51d..fa69c9a 100644
10502--- a/arch/x86/include/asm/mman.h
10503+++ b/arch/x86/include/asm/mman.h
10504@@ -5,4 +5,14 @@
10505
10506 #include <asm-generic/mman.h>
10507
10508+#ifdef __KERNEL__
10509+#ifndef __ASSEMBLY__
10510+#ifdef CONFIG_X86_32
10511+#define arch_mmap_check i386_mmap_check
10512+int i386_mmap_check(unsigned long addr, unsigned long len,
10513+ unsigned long flags);
10514+#endif
10515+#endif
10516+#endif
10517+
10518 #endif /* _ASM_X86_MMAN_H */
10519diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
10520index 80a1dee..239c67d 100644
10521--- a/arch/x86/include/asm/mmu.h
10522+++ b/arch/x86/include/asm/mmu.h
10523@@ -9,10 +9,23 @@
10524 * we put the segment information here.
10525 */
10526 typedef struct {
10527- void *ldt;
10528+ struct desc_struct *ldt;
10529 int size;
10530 struct mutex lock;
10531- void *vdso;
10532+ unsigned long vdso;
10533+
10534+#ifdef CONFIG_X86_32
10535+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
10536+ unsigned long user_cs_base;
10537+ unsigned long user_cs_limit;
10538+
10539+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10540+ cpumask_t cpu_user_cs_mask;
10541+#endif
10542+
10543+#endif
10544+#endif
10545+
10546 } mm_context_t;
10547
10548 #ifdef CONFIG_SMP
10549diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
10550index 8b5393e..8143173 100644
10551--- a/arch/x86/include/asm/mmu_context.h
10552+++ b/arch/x86/include/asm/mmu_context.h
10553@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *mm);
10554
10555 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
10556 {
10557+
10558+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10559+ unsigned int i;
10560+ pgd_t *pgd;
10561+
10562+ pax_open_kernel();
10563+ pgd = get_cpu_pgd(smp_processor_id());
10564+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
10565+ set_pgd_batched(pgd+i, native_make_pgd(0));
10566+ pax_close_kernel();
10567+#endif
10568+
10569 #ifdef CONFIG_SMP
10570 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
10571 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
10572@@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10573 struct task_struct *tsk)
10574 {
10575 unsigned cpu = smp_processor_id();
10576+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)) && defined(CONFIG_SMP)
10577+ int tlbstate = TLBSTATE_OK;
10578+#endif
10579
10580 if (likely(prev != next)) {
10581 #ifdef CONFIG_SMP
10582+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10583+ tlbstate = percpu_read(cpu_tlbstate.state);
10584+#endif
10585 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10586 percpu_write(cpu_tlbstate.active_mm, next);
10587 #endif
10588 cpumask_set_cpu(cpu, mm_cpumask(next));
10589
10590 /* Re-load page tables */
10591+#ifdef CONFIG_PAX_PER_CPU_PGD
10592+ pax_open_kernel();
10593+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10594+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10595+ pax_close_kernel();
10596+ load_cr3(get_cpu_pgd(cpu));
10597+#else
10598 load_cr3(next->pgd);
10599+#endif
10600
10601 /* stop flush ipis for the previous mm */
10602 cpumask_clear_cpu(cpu, mm_cpumask(prev));
10603@@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10604 */
10605 if (unlikely(prev->context.ldt != next->context.ldt))
10606 load_LDT_nolock(&next->context);
10607- }
10608+
10609+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10610+ if (!nx_enabled) {
10611+ smp_mb__before_clear_bit();
10612+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
10613+ smp_mb__after_clear_bit();
10614+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10615+ }
10616+#endif
10617+
10618+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10619+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
10620+ prev->context.user_cs_limit != next->context.user_cs_limit))
10621+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10622 #ifdef CONFIG_SMP
10623+ else if (unlikely(tlbstate != TLBSTATE_OK))
10624+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10625+#endif
10626+#endif
10627+
10628+ }
10629 else {
10630+
10631+#ifdef CONFIG_PAX_PER_CPU_PGD
10632+ pax_open_kernel();
10633+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10634+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10635+ pax_close_kernel();
10636+ load_cr3(get_cpu_pgd(cpu));
10637+#endif
10638+
10639+#ifdef CONFIG_SMP
10640 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10641 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
10642
10643@@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10644 * tlb flush IPI delivery. We must reload CR3
10645 * to make sure to use no freed page tables.
10646 */
10647+
10648+#ifndef CONFIG_PAX_PER_CPU_PGD
10649 load_cr3(next->pgd);
10650+#endif
10651+
10652 load_LDT_nolock(&next->context);
10653+
10654+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
10655+ if (!nx_enabled)
10656+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10657+#endif
10658+
10659+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10660+#ifdef CONFIG_PAX_PAGEEXEC
10661+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && nx_enabled))
10662+#endif
10663+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10664+#endif
10665+
10666 }
10667+#endif
10668 }
10669-#endif
10670 }
10671
10672 #define activate_mm(prev, next) \
10673diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
10674index 3e2ce58..caaf478 100644
10675--- a/arch/x86/include/asm/module.h
10676+++ b/arch/x86/include/asm/module.h
10677@@ -5,6 +5,7 @@
10678
10679 #ifdef CONFIG_X86_64
10680 /* X86_64 does not define MODULE_PROC_FAMILY */
10681+#define MODULE_PROC_FAMILY ""
10682 #elif defined CONFIG_M386
10683 #define MODULE_PROC_FAMILY "386 "
10684 #elif defined CONFIG_M486
10685@@ -59,13 +60,26 @@
10686 #error unknown processor family
10687 #endif
10688
10689-#ifdef CONFIG_X86_32
10690-# ifdef CONFIG_4KSTACKS
10691-# define MODULE_STACKSIZE "4KSTACKS "
10692-# else
10693-# define MODULE_STACKSIZE ""
10694-# endif
10695-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE
10696+#if defined(CONFIG_X86_32) && defined(CONFIG_4KSTACKS)
10697+#define MODULE_STACKSIZE "4KSTACKS "
10698+#else
10699+#define MODULE_STACKSIZE ""
10700 #endif
10701
10702+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
10703+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
10704+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
10705+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
10706+#else
10707+#define MODULE_PAX_KERNEXEC ""
10708+#endif
10709+
10710+#ifdef CONFIG_PAX_MEMORY_UDEREF
10711+#define MODULE_PAX_UDEREF "UDEREF "
10712+#else
10713+#define MODULE_PAX_UDEREF ""
10714+#endif
10715+
10716+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
10717+
10718 #endif /* _ASM_X86_MODULE_H */
10719diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
10720index 7639dbf..e08a58c 100644
10721--- a/arch/x86/include/asm/page_64_types.h
10722+++ b/arch/x86/include/asm/page_64_types.h
10723@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
10724
10725 /* duplicated to the one in bootmem.h */
10726 extern unsigned long max_pfn;
10727-extern unsigned long phys_base;
10728+extern const unsigned long phys_base;
10729
10730 extern unsigned long __phys_addr(unsigned long);
10731 #define __phys_reloc_hide(x) (x)
10732diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
10733index efb3899..ef30687 100644
10734--- a/arch/x86/include/asm/paravirt.h
10735+++ b/arch/x86/include/asm/paravirt.h
10736@@ -648,6 +648,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
10737 val);
10738 }
10739
10740+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
10741+{
10742+ pgdval_t val = native_pgd_val(pgd);
10743+
10744+ if (sizeof(pgdval_t) > sizeof(long))
10745+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
10746+ val, (u64)val >> 32);
10747+ else
10748+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
10749+ val);
10750+}
10751+
10752 static inline void pgd_clear(pgd_t *pgdp)
10753 {
10754 set_pgd(pgdp, __pgd(0));
10755@@ -729,6 +741,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
10756 pv_mmu_ops.set_fixmap(idx, phys, flags);
10757 }
10758
10759+#ifdef CONFIG_PAX_KERNEXEC
10760+static inline unsigned long pax_open_kernel(void)
10761+{
10762+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
10763+}
10764+
10765+static inline unsigned long pax_close_kernel(void)
10766+{
10767+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
10768+}
10769+#else
10770+static inline unsigned long pax_open_kernel(void) { return 0; }
10771+static inline unsigned long pax_close_kernel(void) { return 0; }
10772+#endif
10773+
10774 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
10775
10776 static inline int __raw_spin_is_locked(struct raw_spinlock *lock)
10777@@ -945,7 +972,7 @@ extern void default_banner(void);
10778
10779 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
10780 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
10781-#define PARA_INDIRECT(addr) *%cs:addr
10782+#define PARA_INDIRECT(addr) *%ss:addr
10783 #endif
10784
10785 #define INTERRUPT_RETURN \
10786@@ -1022,6 +1049,21 @@ extern void default_banner(void);
10787 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
10788 CLBR_NONE, \
10789 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
10790+
10791+#define GET_CR0_INTO_RDI \
10792+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
10793+ mov %rax,%rdi
10794+
10795+#define SET_RDI_INTO_CR0 \
10796+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10797+
10798+#define GET_CR3_INTO_RDI \
10799+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
10800+ mov %rax,%rdi
10801+
10802+#define SET_RDI_INTO_CR3 \
10803+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
10804+
10805 #endif /* CONFIG_X86_32 */
10806
10807 #endif /* __ASSEMBLY__ */
10808diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
10809index 9357473..aeb2de5 100644
10810--- a/arch/x86/include/asm/paravirt_types.h
10811+++ b/arch/x86/include/asm/paravirt_types.h
10812@@ -78,19 +78,19 @@ struct pv_init_ops {
10813 */
10814 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
10815 unsigned long addr, unsigned len);
10816-};
10817+} __no_const;
10818
10819
10820 struct pv_lazy_ops {
10821 /* Set deferred update mode, used for batching operations. */
10822 void (*enter)(void);
10823 void (*leave)(void);
10824-};
10825+} __no_const;
10826
10827 struct pv_time_ops {
10828 unsigned long long (*sched_clock)(void);
10829 unsigned long (*get_tsc_khz)(void);
10830-};
10831+} __no_const;
10832
10833 struct pv_cpu_ops {
10834 /* hooks for various privileged instructions */
10835@@ -186,7 +186,7 @@ struct pv_cpu_ops {
10836
10837 void (*start_context_switch)(struct task_struct *prev);
10838 void (*end_context_switch)(struct task_struct *next);
10839-};
10840+} __no_const;
10841
10842 struct pv_irq_ops {
10843 /*
10844@@ -217,7 +217,7 @@ struct pv_apic_ops {
10845 unsigned long start_eip,
10846 unsigned long start_esp);
10847 #endif
10848-};
10849+} __no_const;
10850
10851 struct pv_mmu_ops {
10852 unsigned long (*read_cr2)(void);
10853@@ -301,6 +301,7 @@ struct pv_mmu_ops {
10854 struct paravirt_callee_save make_pud;
10855
10856 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
10857+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
10858 #endif /* PAGETABLE_LEVELS == 4 */
10859 #endif /* PAGETABLE_LEVELS >= 3 */
10860
10861@@ -316,6 +317,12 @@ struct pv_mmu_ops {
10862 an mfn. We can tell which is which from the index. */
10863 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
10864 phys_addr_t phys, pgprot_t flags);
10865+
10866+#ifdef CONFIG_PAX_KERNEXEC
10867+ unsigned long (*pax_open_kernel)(void);
10868+ unsigned long (*pax_close_kernel)(void);
10869+#endif
10870+
10871 };
10872
10873 struct raw_spinlock;
10874@@ -326,7 +333,7 @@ struct pv_lock_ops {
10875 void (*spin_lock_flags)(struct raw_spinlock *lock, unsigned long flags);
10876 int (*spin_trylock)(struct raw_spinlock *lock);
10877 void (*spin_unlock)(struct raw_spinlock *lock);
10878-};
10879+} __no_const;
10880
10881 /* This contains all the paravirt structures: we get a convenient
10882 * number for each function using the offset which we use to indicate
10883diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
10884index b399988..3f47c38 100644
10885--- a/arch/x86/include/asm/pci_x86.h
10886+++ b/arch/x86/include/asm/pci_x86.h
10887@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct pci_dev *dev);
10888 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
10889
10890 struct pci_raw_ops {
10891- int (*read)(unsigned int domain, unsigned int bus, unsigned int devfn,
10892+ int (* const read)(unsigned int domain, unsigned int bus, unsigned int devfn,
10893 int reg, int len, u32 *val);
10894- int (*write)(unsigned int domain, unsigned int bus, unsigned int devfn,
10895+ int (* const write)(unsigned int domain, unsigned int bus, unsigned int devfn,
10896 int reg, int len, u32 val);
10897 };
10898
10899-extern struct pci_raw_ops *raw_pci_ops;
10900-extern struct pci_raw_ops *raw_pci_ext_ops;
10901+extern const struct pci_raw_ops *raw_pci_ops;
10902+extern const struct pci_raw_ops *raw_pci_ext_ops;
10903
10904-extern struct pci_raw_ops pci_direct_conf1;
10905+extern const struct pci_raw_ops pci_direct_conf1;
10906 extern bool port_cf9_safe;
10907
10908 /* arch_initcall level */
10909diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
10910index b65a36d..50345a4 100644
10911--- a/arch/x86/include/asm/percpu.h
10912+++ b/arch/x86/include/asm/percpu.h
10913@@ -78,6 +78,7 @@ do { \
10914 if (0) { \
10915 T__ tmp__; \
10916 tmp__ = (val); \
10917+ (void)tmp__; \
10918 } \
10919 switch (sizeof(var)) { \
10920 case 1: \
10921diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
10922index 271de94..ef944d6 100644
10923--- a/arch/x86/include/asm/pgalloc.h
10924+++ b/arch/x86/include/asm/pgalloc.h
10925@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
10926 pmd_t *pmd, pte_t *pte)
10927 {
10928 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10929+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
10930+}
10931+
10932+static inline void pmd_populate_user(struct mm_struct *mm,
10933+ pmd_t *pmd, pte_t *pte)
10934+{
10935+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10936 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
10937 }
10938
10939diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
10940index 2334982..70bc412 100644
10941--- a/arch/x86/include/asm/pgtable-2level.h
10942+++ b/arch/x86/include/asm/pgtable-2level.h
10943@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
10944
10945 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10946 {
10947+ pax_open_kernel();
10948 *pmdp = pmd;
10949+ pax_close_kernel();
10950 }
10951
10952 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10953diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
10954index 33927d2..ccde329 100644
10955--- a/arch/x86/include/asm/pgtable-3level.h
10956+++ b/arch/x86/include/asm/pgtable-3level.h
10957@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10958
10959 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10960 {
10961+ pax_open_kernel();
10962 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
10963+ pax_close_kernel();
10964 }
10965
10966 static inline void native_set_pud(pud_t *pudp, pud_t pud)
10967 {
10968+ pax_open_kernel();
10969 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
10970+ pax_close_kernel();
10971 }
10972
10973 /*
10974diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
10975index af6fd36..867ff74 100644
10976--- a/arch/x86/include/asm/pgtable.h
10977+++ b/arch/x86/include/asm/pgtable.h
10978@@ -39,6 +39,7 @@ extern struct list_head pgd_list;
10979
10980 #ifndef __PAGETABLE_PUD_FOLDED
10981 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
10982+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
10983 #define pgd_clear(pgd) native_pgd_clear(pgd)
10984 #endif
10985
10986@@ -74,12 +75,51 @@ extern struct list_head pgd_list;
10987
10988 #define arch_end_context_switch(prev) do {} while(0)
10989
10990+#define pax_open_kernel() native_pax_open_kernel()
10991+#define pax_close_kernel() native_pax_close_kernel()
10992 #endif /* CONFIG_PARAVIRT */
10993
10994+#define __HAVE_ARCH_PAX_OPEN_KERNEL
10995+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
10996+
10997+#ifdef CONFIG_PAX_KERNEXEC
10998+static inline unsigned long native_pax_open_kernel(void)
10999+{
11000+ unsigned long cr0;
11001+
11002+ preempt_disable();
11003+ barrier();
11004+ cr0 = read_cr0() ^ X86_CR0_WP;
11005+ BUG_ON(unlikely(cr0 & X86_CR0_WP));
11006+ write_cr0(cr0);
11007+ return cr0 ^ X86_CR0_WP;
11008+}
11009+
11010+static inline unsigned long native_pax_close_kernel(void)
11011+{
11012+ unsigned long cr0;
11013+
11014+ cr0 = read_cr0() ^ X86_CR0_WP;
11015+ BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
11016+ write_cr0(cr0);
11017+ barrier();
11018+ preempt_enable_no_resched();
11019+ return cr0 ^ X86_CR0_WP;
11020+}
11021+#else
11022+static inline unsigned long native_pax_open_kernel(void) { return 0; }
11023+static inline unsigned long native_pax_close_kernel(void) { return 0; }
11024+#endif
11025+
11026 /*
11027 * The following only work if pte_present() is true.
11028 * Undefined behaviour if not..
11029 */
11030+static inline int pte_user(pte_t pte)
11031+{
11032+ return pte_val(pte) & _PAGE_USER;
11033+}
11034+
11035 static inline int pte_dirty(pte_t pte)
11036 {
11037 return pte_flags(pte) & _PAGE_DIRTY;
11038@@ -167,9 +207,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
11039 return pte_clear_flags(pte, _PAGE_RW);
11040 }
11041
11042+static inline pte_t pte_mkread(pte_t pte)
11043+{
11044+ return __pte(pte_val(pte) | _PAGE_USER);
11045+}
11046+
11047 static inline pte_t pte_mkexec(pte_t pte)
11048 {
11049- return pte_clear_flags(pte, _PAGE_NX);
11050+#ifdef CONFIG_X86_PAE
11051+ if (__supported_pte_mask & _PAGE_NX)
11052+ return pte_clear_flags(pte, _PAGE_NX);
11053+ else
11054+#endif
11055+ return pte_set_flags(pte, _PAGE_USER);
11056+}
11057+
11058+static inline pte_t pte_exprotect(pte_t pte)
11059+{
11060+#ifdef CONFIG_X86_PAE
11061+ if (__supported_pte_mask & _PAGE_NX)
11062+ return pte_set_flags(pte, _PAGE_NX);
11063+ else
11064+#endif
11065+ return pte_clear_flags(pte, _PAGE_USER);
11066 }
11067
11068 static inline pte_t pte_mkdirty(pte_t pte)
11069@@ -302,6 +362,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
11070 #endif
11071
11072 #ifndef __ASSEMBLY__
11073+
11074+#ifdef CONFIG_PAX_PER_CPU_PGD
11075+extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
11076+static inline pgd_t *get_cpu_pgd(unsigned int cpu)
11077+{
11078+ return cpu_pgd[cpu];
11079+}
11080+#endif
11081+
11082 #include <linux/mm_types.h>
11083
11084 static inline int pte_none(pte_t pte)
11085@@ -472,7 +541,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
11086
11087 static inline int pgd_bad(pgd_t pgd)
11088 {
11089- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
11090+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
11091 }
11092
11093 static inline int pgd_none(pgd_t pgd)
11094@@ -495,7 +564,12 @@ static inline int pgd_none(pgd_t pgd)
11095 * pgd_offset() returns a (pgd_t *)
11096 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
11097 */
11098-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
11099+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
11100+
11101+#ifdef CONFIG_PAX_PER_CPU_PGD
11102+#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
11103+#endif
11104+
11105 /*
11106 * a shortcut which implies the use of the kernel's pgd, instead
11107 * of a process's
11108@@ -506,6 +580,20 @@ static inline int pgd_none(pgd_t pgd)
11109 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
11110 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
11111
11112+#ifdef CONFIG_X86_32
11113+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
11114+#else
11115+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
11116+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
11117+
11118+#ifdef CONFIG_PAX_MEMORY_UDEREF
11119+#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
11120+#else
11121+#define PAX_USER_SHADOW_BASE (_AC(0,UL))
11122+#endif
11123+
11124+#endif
11125+
11126 #ifndef __ASSEMBLY__
11127
11128 extern int direct_gbpages;
11129@@ -611,11 +699,23 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm,
11130 * dst and src can be on the same page, but the range must not overlap,
11131 * and must not cross a page boundary.
11132 */
11133-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
11134+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
11135 {
11136- memcpy(dst, src, count * sizeof(pgd_t));
11137+ pax_open_kernel();
11138+ while (count--)
11139+ *dst++ = *src++;
11140+ pax_close_kernel();
11141 }
11142
11143+#ifdef CONFIG_PAX_PER_CPU_PGD
11144+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11145+#endif
11146+
11147+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11148+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11149+#else
11150+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {}
11151+#endif
11152
11153 #include <asm-generic/pgtable.h>
11154 #endif /* __ASSEMBLY__ */
11155diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
11156index 750f1bf..971e839 100644
11157--- a/arch/x86/include/asm/pgtable_32.h
11158+++ b/arch/x86/include/asm/pgtable_32.h
11159@@ -26,9 +26,6 @@
11160 struct mm_struct;
11161 struct vm_area_struct;
11162
11163-extern pgd_t swapper_pg_dir[1024];
11164-extern pgd_t trampoline_pg_dir[1024];
11165-
11166 static inline void pgtable_cache_init(void) { }
11167 static inline void check_pgt_cache(void) { }
11168 void paging_init(void);
11169@@ -49,6 +46,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11170 # include <asm/pgtable-2level.h>
11171 #endif
11172
11173+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
11174+extern pgd_t trampoline_pg_dir[PTRS_PER_PGD];
11175+#ifdef CONFIG_X86_PAE
11176+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
11177+#endif
11178+
11179 #if defined(CONFIG_HIGHPTE)
11180 #define __KM_PTE \
11181 (in_nmi() ? KM_NMI_PTE : \
11182@@ -73,7 +76,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11183 /* Clear a kernel PTE and flush it from the TLB */
11184 #define kpte_clear_flush(ptep, vaddr) \
11185 do { \
11186+ pax_open_kernel(); \
11187 pte_clear(&init_mm, (vaddr), (ptep)); \
11188+ pax_close_kernel(); \
11189 __flush_tlb_one((vaddr)); \
11190 } while (0)
11191
11192@@ -85,6 +90,9 @@ do { \
11193
11194 #endif /* !__ASSEMBLY__ */
11195
11196+#define HAVE_ARCH_UNMAPPED_AREA
11197+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
11198+
11199 /*
11200 * kern_addr_valid() is (1) for FLATMEM and (0) for
11201 * SPARSEMEM and DISCONTIGMEM
11202diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
11203index 5e67c15..12d5c47 100644
11204--- a/arch/x86/include/asm/pgtable_32_types.h
11205+++ b/arch/x86/include/asm/pgtable_32_types.h
11206@@ -8,7 +8,7 @@
11207 */
11208 #ifdef CONFIG_X86_PAE
11209 # include <asm/pgtable-3level_types.h>
11210-# define PMD_SIZE (1UL << PMD_SHIFT)
11211+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
11212 # define PMD_MASK (~(PMD_SIZE - 1))
11213 #else
11214 # include <asm/pgtable-2level_types.h>
11215@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
11216 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
11217 #endif
11218
11219+#ifdef CONFIG_PAX_KERNEXEC
11220+#ifndef __ASSEMBLY__
11221+extern unsigned char MODULES_EXEC_VADDR[];
11222+extern unsigned char MODULES_EXEC_END[];
11223+#endif
11224+#include <asm/boot.h>
11225+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
11226+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
11227+#else
11228+#define ktla_ktva(addr) (addr)
11229+#define ktva_ktla(addr) (addr)
11230+#endif
11231+
11232 #define MODULES_VADDR VMALLOC_START
11233 #define MODULES_END VMALLOC_END
11234 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
11235diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
11236index c57a301..6b414ff 100644
11237--- a/arch/x86/include/asm/pgtable_64.h
11238+++ b/arch/x86/include/asm/pgtable_64.h
11239@@ -16,10 +16,14 @@
11240
11241 extern pud_t level3_kernel_pgt[512];
11242 extern pud_t level3_ident_pgt[512];
11243+extern pud_t level3_vmalloc_start_pgt[512];
11244+extern pud_t level3_vmalloc_end_pgt[512];
11245+extern pud_t level3_vmemmap_pgt[512];
11246+extern pud_t level2_vmemmap_pgt[512];
11247 extern pmd_t level2_kernel_pgt[512];
11248 extern pmd_t level2_fixmap_pgt[512];
11249-extern pmd_t level2_ident_pgt[512];
11250-extern pgd_t init_level4_pgt[];
11251+extern pmd_t level2_ident_pgt[512*2];
11252+extern pgd_t init_level4_pgt[512];
11253
11254 #define swapper_pg_dir init_level4_pgt
11255
11256@@ -74,7 +78,9 @@ static inline pte_t native_ptep_get_and_clear(pte_t *xp)
11257
11258 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11259 {
11260+ pax_open_kernel();
11261 *pmdp = pmd;
11262+ pax_close_kernel();
11263 }
11264
11265 static inline void native_pmd_clear(pmd_t *pmd)
11266@@ -94,6 +100,13 @@ static inline void native_pud_clear(pud_t *pud)
11267
11268 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
11269 {
11270+ pax_open_kernel();
11271+ *pgdp = pgd;
11272+ pax_close_kernel();
11273+}
11274+
11275+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
11276+{
11277 *pgdp = pgd;
11278 }
11279
11280diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
11281index 766ea16..5b96cb3 100644
11282--- a/arch/x86/include/asm/pgtable_64_types.h
11283+++ b/arch/x86/include/asm/pgtable_64_types.h
11284@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
11285 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
11286 #define MODULES_END _AC(0xffffffffff000000, UL)
11287 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
11288+#define MODULES_EXEC_VADDR MODULES_VADDR
11289+#define MODULES_EXEC_END MODULES_END
11290+
11291+#define ktla_ktva(addr) (addr)
11292+#define ktva_ktla(addr) (addr)
11293
11294 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
11295diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
11296index d1f4a76..2f46ba1 100644
11297--- a/arch/x86/include/asm/pgtable_types.h
11298+++ b/arch/x86/include/asm/pgtable_types.h
11299@@ -16,12 +16,11 @@
11300 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
11301 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
11302 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
11303-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
11304+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
11305 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
11306 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
11307 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
11308-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
11309-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
11310+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
11311 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
11312
11313 /* If _PAGE_BIT_PRESENT is clear, we use these: */
11314@@ -39,7 +38,6 @@
11315 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
11316 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
11317 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
11318-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
11319 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
11320 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
11321 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
11322@@ -55,8 +53,10 @@
11323
11324 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
11325 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
11326-#else
11327+#elif defined(CONFIG_KMEMCHECK)
11328 #define _PAGE_NX (_AT(pteval_t, 0))
11329+#else
11330+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
11331 #endif
11332
11333 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
11334@@ -93,6 +93,9 @@
11335 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
11336 _PAGE_ACCESSED)
11337
11338+#define PAGE_READONLY_NOEXEC PAGE_READONLY
11339+#define PAGE_SHARED_NOEXEC PAGE_SHARED
11340+
11341 #define __PAGE_KERNEL_EXEC \
11342 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
11343 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
11344@@ -103,8 +106,8 @@
11345 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
11346 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
11347 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
11348-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
11349-#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_VSYSCALL | _PAGE_PCD | _PAGE_PWT)
11350+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
11351+#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_RO | _PAGE_PCD | _PAGE_PWT | _PAGE_USER)
11352 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
11353 #define __PAGE_KERNEL_LARGE_NOCACHE (__PAGE_KERNEL | _PAGE_CACHE_UC | _PAGE_PSE)
11354 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
11355@@ -163,8 +166,8 @@
11356 * bits are combined, this will alow user to access the high address mapped
11357 * VDSO in the presence of CONFIG_COMPAT_VDSO
11358 */
11359-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
11360-#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
11361+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11362+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11363 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
11364 #endif
11365
11366@@ -202,7 +205,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
11367 {
11368 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
11369 }
11370+#endif
11371
11372+#if PAGETABLE_LEVELS == 3
11373+#include <asm-generic/pgtable-nopud.h>
11374+#endif
11375+
11376+#if PAGETABLE_LEVELS == 2
11377+#include <asm-generic/pgtable-nopmd.h>
11378+#endif
11379+
11380+#ifndef __ASSEMBLY__
11381 #if PAGETABLE_LEVELS > 3
11382 typedef struct { pudval_t pud; } pud_t;
11383
11384@@ -216,8 +229,6 @@ static inline pudval_t native_pud_val(pud_t pud)
11385 return pud.pud;
11386 }
11387 #else
11388-#include <asm-generic/pgtable-nopud.h>
11389-
11390 static inline pudval_t native_pud_val(pud_t pud)
11391 {
11392 return native_pgd_val(pud.pgd);
11393@@ -237,8 +248,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
11394 return pmd.pmd;
11395 }
11396 #else
11397-#include <asm-generic/pgtable-nopmd.h>
11398-
11399 static inline pmdval_t native_pmd_val(pmd_t pmd)
11400 {
11401 return native_pgd_val(pmd.pud.pgd);
11402@@ -278,7 +287,16 @@ typedef struct page *pgtable_t;
11403
11404 extern pteval_t __supported_pte_mask;
11405 extern void set_nx(void);
11406+
11407+#ifdef CONFIG_X86_32
11408+#ifdef CONFIG_X86_PAE
11409 extern int nx_enabled;
11410+#else
11411+#define nx_enabled (0)
11412+#endif
11413+#else
11414+#define nx_enabled (1)
11415+#endif
11416
11417 #define pgprot_writecombine pgprot_writecombine
11418 extern pgprot_t pgprot_writecombine(pgprot_t prot);
11419diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
11420index fa04dea..5f823fc 100644
11421--- a/arch/x86/include/asm/processor.h
11422+++ b/arch/x86/include/asm/processor.h
11423@@ -272,7 +272,7 @@ struct tss_struct {
11424
11425 } ____cacheline_aligned;
11426
11427-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
11428+extern struct tss_struct init_tss[NR_CPUS];
11429
11430 /*
11431 * Save the original ist values for checking stack pointers during debugging
11432@@ -911,11 +911,18 @@ static inline void spin_lock_prefetch(const void *x)
11433 */
11434 #define TASK_SIZE PAGE_OFFSET
11435 #define TASK_SIZE_MAX TASK_SIZE
11436+
11437+#ifdef CONFIG_PAX_SEGMEXEC
11438+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
11439+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
11440+#else
11441 #define STACK_TOP TASK_SIZE
11442-#define STACK_TOP_MAX STACK_TOP
11443+#endif
11444+
11445+#define STACK_TOP_MAX TASK_SIZE
11446
11447 #define INIT_THREAD { \
11448- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11449+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11450 .vm86_info = NULL, \
11451 .sysenter_cs = __KERNEL_CS, \
11452 .io_bitmap_ptr = NULL, \
11453@@ -929,7 +936,7 @@ static inline void spin_lock_prefetch(const void *x)
11454 */
11455 #define INIT_TSS { \
11456 .x86_tss = { \
11457- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11458+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11459 .ss0 = __KERNEL_DS, \
11460 .ss1 = __KERNEL_CS, \
11461 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
11462@@ -940,11 +947,7 @@ static inline void spin_lock_prefetch(const void *x)
11463 extern unsigned long thread_saved_pc(struct task_struct *tsk);
11464
11465 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
11466-#define KSTK_TOP(info) \
11467-({ \
11468- unsigned long *__ptr = (unsigned long *)(info); \
11469- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
11470-})
11471+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
11472
11473 /*
11474 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
11475@@ -959,7 +962,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11476 #define task_pt_regs(task) \
11477 ({ \
11478 struct pt_regs *__regs__; \
11479- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
11480+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
11481 __regs__ - 1; \
11482 })
11483
11484@@ -969,13 +972,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11485 /*
11486 * User space process size. 47bits minus one guard page.
11487 */
11488-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
11489+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
11490
11491 /* This decides where the kernel will search for a free chunk of vm
11492 * space during mmap's.
11493 */
11494 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
11495- 0xc0000000 : 0xFFFFe000)
11496+ 0xc0000000 : 0xFFFFf000)
11497
11498 #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
11499 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
11500@@ -986,11 +989,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11501 #define STACK_TOP_MAX TASK_SIZE_MAX
11502
11503 #define INIT_THREAD { \
11504- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11505+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11506 }
11507
11508 #define INIT_TSS { \
11509- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11510+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11511 }
11512
11513 /*
11514@@ -1012,6 +1015,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
11515 */
11516 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
11517
11518+#ifdef CONFIG_PAX_SEGMEXEC
11519+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
11520+#endif
11521+
11522 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
11523
11524 /* Get/set a process' ability to use the timestamp counter instruction */
11525diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
11526index 0f0d908..f2e3da2 100644
11527--- a/arch/x86/include/asm/ptrace.h
11528+++ b/arch/x86/include/asm/ptrace.h
11529@@ -151,28 +151,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
11530 }
11531
11532 /*
11533- * user_mode_vm(regs) determines whether a register set came from user mode.
11534+ * user_mode(regs) determines whether a register set came from user mode.
11535 * This is true if V8086 mode was enabled OR if the register set was from
11536 * protected mode with RPL-3 CS value. This tricky test checks that with
11537 * one comparison. Many places in the kernel can bypass this full check
11538- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
11539+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
11540+ * be used.
11541 */
11542-static inline int user_mode(struct pt_regs *regs)
11543+static inline int user_mode_novm(struct pt_regs *regs)
11544 {
11545 #ifdef CONFIG_X86_32
11546 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
11547 #else
11548- return !!(regs->cs & 3);
11549+ return !!(regs->cs & SEGMENT_RPL_MASK);
11550 #endif
11551 }
11552
11553-static inline int user_mode_vm(struct pt_regs *regs)
11554+static inline int user_mode(struct pt_regs *regs)
11555 {
11556 #ifdef CONFIG_X86_32
11557 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
11558 USER_RPL;
11559 #else
11560- return user_mode(regs);
11561+ return user_mode_novm(regs);
11562 #endif
11563 }
11564
11565diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
11566index 562d4fd..6e39df1 100644
11567--- a/arch/x86/include/asm/reboot.h
11568+++ b/arch/x86/include/asm/reboot.h
11569@@ -6,19 +6,19 @@
11570 struct pt_regs;
11571
11572 struct machine_ops {
11573- void (*restart)(char *cmd);
11574- void (*halt)(void);
11575- void (*power_off)(void);
11576+ void (* __noreturn restart)(char *cmd);
11577+ void (* __noreturn halt)(void);
11578+ void (* __noreturn power_off)(void);
11579 void (*shutdown)(void);
11580 void (*crash_shutdown)(struct pt_regs *);
11581- void (*emergency_restart)(void);
11582-};
11583+ void (* __noreturn emergency_restart)(void);
11584+} __no_const;
11585
11586 extern struct machine_ops machine_ops;
11587
11588 void native_machine_crash_shutdown(struct pt_regs *regs);
11589 void native_machine_shutdown(void);
11590-void machine_real_restart(const unsigned char *code, int length);
11591+void machine_real_restart(const unsigned char *code, unsigned int length) __noreturn;
11592
11593 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
11594 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
11595diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
11596index 606ede1..dbfff37 100644
11597--- a/arch/x86/include/asm/rwsem.h
11598+++ b/arch/x86/include/asm/rwsem.h
11599@@ -118,6 +118,14 @@ static inline void __down_read(struct rw_semaphore *sem)
11600 {
11601 asm volatile("# beginning down_read\n\t"
11602 LOCK_PREFIX _ASM_INC "(%1)\n\t"
11603+
11604+#ifdef CONFIG_PAX_REFCOUNT
11605+ "jno 0f\n"
11606+ LOCK_PREFIX _ASM_DEC "(%1)\n\t"
11607+ "int $4\n0:\n"
11608+ _ASM_EXTABLE(0b, 0b)
11609+#endif
11610+
11611 /* adds 0x00000001, returns the old value */
11612 " jns 1f\n"
11613 " call call_rwsem_down_read_failed\n"
11614@@ -139,6 +147,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
11615 "1:\n\t"
11616 " mov %1,%2\n\t"
11617 " add %3,%2\n\t"
11618+
11619+#ifdef CONFIG_PAX_REFCOUNT
11620+ "jno 0f\n"
11621+ "sub %3,%2\n"
11622+ "int $4\n0:\n"
11623+ _ASM_EXTABLE(0b, 0b)
11624+#endif
11625+
11626 " jle 2f\n\t"
11627 LOCK_PREFIX " cmpxchg %2,%0\n\t"
11628 " jnz 1b\n\t"
11629@@ -160,6 +176,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
11630 tmp = RWSEM_ACTIVE_WRITE_BIAS;
11631 asm volatile("# beginning down_write\n\t"
11632 LOCK_PREFIX " xadd %1,(%2)\n\t"
11633+
11634+#ifdef CONFIG_PAX_REFCOUNT
11635+ "jno 0f\n"
11636+ "mov %1,(%2)\n"
11637+ "int $4\n0:\n"
11638+ _ASM_EXTABLE(0b, 0b)
11639+#endif
11640+
11641 /* subtract 0x0000ffff, returns the old value */
11642 " test %1,%1\n\t"
11643 /* was the count 0 before? */
11644@@ -198,6 +222,14 @@ static inline void __up_read(struct rw_semaphore *sem)
11645 rwsem_count_t tmp = -RWSEM_ACTIVE_READ_BIAS;
11646 asm volatile("# beginning __up_read\n\t"
11647 LOCK_PREFIX " xadd %1,(%2)\n\t"
11648+
11649+#ifdef CONFIG_PAX_REFCOUNT
11650+ "jno 0f\n"
11651+ "mov %1,(%2)\n"
11652+ "int $4\n0:\n"
11653+ _ASM_EXTABLE(0b, 0b)
11654+#endif
11655+
11656 /* subtracts 1, returns the old value */
11657 " jns 1f\n\t"
11658 " call call_rwsem_wake\n"
11659@@ -216,6 +248,14 @@ static inline void __up_write(struct rw_semaphore *sem)
11660 rwsem_count_t tmp;
11661 asm volatile("# beginning __up_write\n\t"
11662 LOCK_PREFIX " xadd %1,(%2)\n\t"
11663+
11664+#ifdef CONFIG_PAX_REFCOUNT
11665+ "jno 0f\n"
11666+ "mov %1,(%2)\n"
11667+ "int $4\n0:\n"
11668+ _ASM_EXTABLE(0b, 0b)
11669+#endif
11670+
11671 /* tries to transition
11672 0xffff0001 -> 0x00000000 */
11673 " jz 1f\n"
11674@@ -234,6 +274,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11675 {
11676 asm volatile("# beginning __downgrade_write\n\t"
11677 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
11678+
11679+#ifdef CONFIG_PAX_REFCOUNT
11680+ "jno 0f\n"
11681+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
11682+ "int $4\n0:\n"
11683+ _ASM_EXTABLE(0b, 0b)
11684+#endif
11685+
11686 /*
11687 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
11688 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
11689@@ -253,7 +301,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11690 static inline void rwsem_atomic_add(rwsem_count_t delta,
11691 struct rw_semaphore *sem)
11692 {
11693- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
11694+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
11695+
11696+#ifdef CONFIG_PAX_REFCOUNT
11697+ "jno 0f\n"
11698+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
11699+ "int $4\n0:\n"
11700+ _ASM_EXTABLE(0b, 0b)
11701+#endif
11702+
11703 : "+m" (sem->count)
11704 : "er" (delta));
11705 }
11706@@ -266,7 +322,15 @@ static inline rwsem_count_t rwsem_atomic_update(rwsem_count_t delta,
11707 {
11708 rwsem_count_t tmp = delta;
11709
11710- asm volatile(LOCK_PREFIX "xadd %0,%1"
11711+ asm volatile(LOCK_PREFIX "xadd %0,%1\n"
11712+
11713+#ifdef CONFIG_PAX_REFCOUNT
11714+ "jno 0f\n"
11715+ "mov %0,%1\n"
11716+ "int $4\n0:\n"
11717+ _ASM_EXTABLE(0b, 0b)
11718+#endif
11719+
11720 : "+r" (tmp), "+m" (sem->count)
11721 : : "memory");
11722
11723diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
11724index 14e0ed8..7f7dd5e 100644
11725--- a/arch/x86/include/asm/segment.h
11726+++ b/arch/x86/include/asm/segment.h
11727@@ -62,10 +62,15 @@
11728 * 26 - ESPFIX small SS
11729 * 27 - per-cpu [ offset to per-cpu data area ]
11730 * 28 - stack_canary-20 [ for stack protector ]
11731- * 29 - unused
11732- * 30 - unused
11733+ * 29 - PCI BIOS CS
11734+ * 30 - PCI BIOS DS
11735 * 31 - TSS for double fault handler
11736 */
11737+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
11738+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
11739+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
11740+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
11741+
11742 #define GDT_ENTRY_TLS_MIN 6
11743 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
11744
11745@@ -77,6 +82,8 @@
11746
11747 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE + 0)
11748
11749+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
11750+
11751 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE + 1)
11752
11753 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE + 4)
11754@@ -88,7 +95,7 @@
11755 #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14)
11756 #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)
11757
11758-#define GDT_ENTRY_PERCPU (GDT_ENTRY_KERNEL_BASE + 15)
11759+#define GDT_ENTRY_PERCPU (GDT_ENTRY_KERNEL_BASE + 15)
11760 #ifdef CONFIG_SMP
11761 #define __KERNEL_PERCPU (GDT_ENTRY_PERCPU * 8)
11762 #else
11763@@ -102,6 +109,12 @@
11764 #define __KERNEL_STACK_CANARY 0
11765 #endif
11766
11767+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE + 17)
11768+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
11769+
11770+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE + 18)
11771+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
11772+
11773 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
11774
11775 /*
11776@@ -139,7 +152,7 @@
11777 */
11778
11779 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
11780-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
11781+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
11782
11783
11784 #else
11785@@ -163,6 +176,8 @@
11786 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS * 8 + 3)
11787 #define __USER32_DS __USER_DS
11788
11789+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
11790+
11791 #define GDT_ENTRY_TSS 8 /* needs two entries */
11792 #define GDT_ENTRY_LDT 10 /* needs two entries */
11793 #define GDT_ENTRY_TLS_MIN 12
11794@@ -183,6 +198,7 @@
11795 #endif
11796
11797 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS * 8)
11798+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS * 8)
11799 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
11800 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
11801 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
11802diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
11803index 4c2f63c..5685db2 100644
11804--- a/arch/x86/include/asm/smp.h
11805+++ b/arch/x86/include/asm/smp.h
11806@@ -24,7 +24,7 @@ extern unsigned int num_processors;
11807 DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
11808 DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
11809 DECLARE_PER_CPU(u16, cpu_llc_id);
11810-DECLARE_PER_CPU(int, cpu_number);
11811+DECLARE_PER_CPU(unsigned int, cpu_number);
11812
11813 static inline struct cpumask *cpu_sibling_mask(int cpu)
11814 {
11815@@ -40,10 +40,7 @@ DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid);
11816 DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
11817
11818 /* Static state in head.S used to set up a CPU */
11819-extern struct {
11820- void *sp;
11821- unsigned short ss;
11822-} stack_start;
11823+extern unsigned long stack_start; /* Initial stack pointer address */
11824
11825 struct smp_ops {
11826 void (*smp_prepare_boot_cpu)(void);
11827@@ -60,7 +57,7 @@ struct smp_ops {
11828
11829 void (*send_call_func_ipi)(const struct cpumask *mask);
11830 void (*send_call_func_single_ipi)(int cpu);
11831-};
11832+} __no_const;
11833
11834 /* Globals due to paravirt */
11835 extern void set_cpu_sibling_map(int cpu);
11836@@ -175,14 +172,8 @@ extern unsigned disabled_cpus __cpuinitdata;
11837 extern int safe_smp_processor_id(void);
11838
11839 #elif defined(CONFIG_X86_64_SMP)
11840-#define raw_smp_processor_id() (percpu_read(cpu_number))
11841-
11842-#define stack_smp_processor_id() \
11843-({ \
11844- struct thread_info *ti; \
11845- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
11846- ti->cpu; \
11847-})
11848+#define raw_smp_processor_id() (percpu_read(cpu_number))
11849+#define stack_smp_processor_id() raw_smp_processor_id()
11850 #define safe_smp_processor_id() smp_processor_id()
11851
11852 #endif
11853diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
11854index 4e77853..4359783 100644
11855--- a/arch/x86/include/asm/spinlock.h
11856+++ b/arch/x86/include/asm/spinlock.h
11857@@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(raw_rwlock_t *lock)
11858 static inline void __raw_read_lock(raw_rwlock_t *rw)
11859 {
11860 asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t"
11861+
11862+#ifdef CONFIG_PAX_REFCOUNT
11863+ "jno 0f\n"
11864+ LOCK_PREFIX " addl $1,(%0)\n"
11865+ "int $4\n0:\n"
11866+ _ASM_EXTABLE(0b, 0b)
11867+#endif
11868+
11869 "jns 1f\n"
11870 "call __read_lock_failed\n\t"
11871 "1:\n"
11872@@ -258,6 +266,14 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
11873 static inline void __raw_write_lock(raw_rwlock_t *rw)
11874 {
11875 asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t"
11876+
11877+#ifdef CONFIG_PAX_REFCOUNT
11878+ "jno 0f\n"
11879+ LOCK_PREFIX " addl %1,(%0)\n"
11880+ "int $4\n0:\n"
11881+ _ASM_EXTABLE(0b, 0b)
11882+#endif
11883+
11884 "jz 1f\n"
11885 "call __write_lock_failed\n\t"
11886 "1:\n"
11887@@ -286,12 +302,29 @@ static inline int __raw_write_trylock(raw_rwlock_t *lock)
11888
11889 static inline void __raw_read_unlock(raw_rwlock_t *rw)
11890 {
11891- asm volatile(LOCK_PREFIX "incl %0" :"+m" (rw->lock) : : "memory");
11892+ asm volatile(LOCK_PREFIX "incl %0\n"
11893+
11894+#ifdef CONFIG_PAX_REFCOUNT
11895+ "jno 0f\n"
11896+ LOCK_PREFIX "decl %0\n"
11897+ "int $4\n0:\n"
11898+ _ASM_EXTABLE(0b, 0b)
11899+#endif
11900+
11901+ :"+m" (rw->lock) : : "memory");
11902 }
11903
11904 static inline void __raw_write_unlock(raw_rwlock_t *rw)
11905 {
11906- asm volatile(LOCK_PREFIX "addl %1, %0"
11907+ asm volatile(LOCK_PREFIX "addl %1, %0\n"
11908+
11909+#ifdef CONFIG_PAX_REFCOUNT
11910+ "jno 0f\n"
11911+ LOCK_PREFIX "subl %1, %0\n"
11912+ "int $4\n0:\n"
11913+ _ASM_EXTABLE(0b, 0b)
11914+#endif
11915+
11916 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
11917 }
11918
11919diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
11920index 1575177..cb23f52 100644
11921--- a/arch/x86/include/asm/stackprotector.h
11922+++ b/arch/x86/include/asm/stackprotector.h
11923@@ -48,7 +48,7 @@
11924 * head_32 for boot CPU and setup_per_cpu_areas() for others.
11925 */
11926 #define GDT_STACK_CANARY_INIT \
11927- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
11928+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
11929
11930 /*
11931 * Initialize the stackprotector canary value.
11932@@ -113,7 +113,7 @@ static inline void setup_stack_canary_segment(int cpu)
11933
11934 static inline void load_stack_canary_segment(void)
11935 {
11936-#ifdef CONFIG_X86_32
11937+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
11938 asm volatile ("mov %0, %%gs" : : "r" (0));
11939 #endif
11940 }
11941diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
11942index e0fbf29..858ef4a 100644
11943--- a/arch/x86/include/asm/system.h
11944+++ b/arch/x86/include/asm/system.h
11945@@ -132,7 +132,7 @@ do { \
11946 "thread_return:\n\t" \
11947 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
11948 __switch_canary \
11949- "movq %P[thread_info](%%rsi),%%r8\n\t" \
11950+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
11951 "movq %%rax,%%rdi\n\t" \
11952 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
11953 "jnz ret_from_fork\n\t" \
11954@@ -143,7 +143,7 @@ do { \
11955 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
11956 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
11957 [_tif_fork] "i" (_TIF_FORK), \
11958- [thread_info] "i" (offsetof(struct task_struct, stack)), \
11959+ [thread_info] "m" (per_cpu_var(current_tinfo)), \
11960 [current_task] "m" (per_cpu_var(current_task)) \
11961 __switch_canary_iparam \
11962 : "memory", "cc" __EXTRA_CLOBBER)
11963@@ -200,7 +200,7 @@ static inline unsigned long get_limit(unsigned long segment)
11964 {
11965 unsigned long __limit;
11966 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
11967- return __limit + 1;
11968+ return __limit;
11969 }
11970
11971 static inline void native_clts(void)
11972@@ -340,12 +340,12 @@ void enable_hlt(void);
11973
11974 void cpu_idle_wait(void);
11975
11976-extern unsigned long arch_align_stack(unsigned long sp);
11977+#define arch_align_stack(x) ((x) & ~0xfUL)
11978 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
11979
11980 void default_idle(void);
11981
11982-void stop_this_cpu(void *dummy);
11983+void stop_this_cpu(void *dummy) __noreturn;
11984
11985 /*
11986 * Force strict CPU ordering.
11987diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
11988index 19c3ce4..8962535 100644
11989--- a/arch/x86/include/asm/thread_info.h
11990+++ b/arch/x86/include/asm/thread_info.h
11991@@ -10,6 +10,7 @@
11992 #include <linux/compiler.h>
11993 #include <asm/page.h>
11994 #include <asm/types.h>
11995+#include <asm/percpu.h>
11996
11997 /*
11998 * low level task data that entry.S needs immediate access to
11999@@ -24,7 +25,6 @@ struct exec_domain;
12000 #include <asm/atomic.h>
12001
12002 struct thread_info {
12003- struct task_struct *task; /* main task structure */
12004 struct exec_domain *exec_domain; /* execution domain */
12005 __u32 flags; /* low level flags */
12006 __u32 status; /* thread synchronous flags */
12007@@ -34,18 +34,12 @@ struct thread_info {
12008 mm_segment_t addr_limit;
12009 struct restart_block restart_block;
12010 void __user *sysenter_return;
12011-#ifdef CONFIG_X86_32
12012- unsigned long previous_esp; /* ESP of the previous stack in
12013- case of nested (IRQ) stacks
12014- */
12015- __u8 supervisor_stack[0];
12016-#endif
12017+ unsigned long lowest_stack;
12018 int uaccess_err;
12019 };
12020
12021-#define INIT_THREAD_INFO(tsk) \
12022+#define INIT_THREAD_INFO \
12023 { \
12024- .task = &tsk, \
12025 .exec_domain = &default_exec_domain, \
12026 .flags = 0, \
12027 .cpu = 0, \
12028@@ -56,7 +50,7 @@ struct thread_info {
12029 }, \
12030 }
12031
12032-#define init_thread_info (init_thread_union.thread_info)
12033+#define init_thread_info (init_thread_union.stack)
12034 #define init_stack (init_thread_union.stack)
12035
12036 #else /* !__ASSEMBLY__ */
12037@@ -163,45 +157,40 @@ struct thread_info {
12038 #define alloc_thread_info(tsk) \
12039 ((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER))
12040
12041-#ifdef CONFIG_X86_32
12042-
12043-#define STACK_WARN (THREAD_SIZE/8)
12044-/*
12045- * macros/functions for gaining access to the thread information structure
12046- *
12047- * preempt_count needs to be 1 initially, until the scheduler is functional.
12048- */
12049-#ifndef __ASSEMBLY__
12050-
12051-
12052-/* how to get the current stack pointer from C */
12053-register unsigned long current_stack_pointer asm("esp") __used;
12054-
12055-/* how to get the thread information struct from C */
12056-static inline struct thread_info *current_thread_info(void)
12057-{
12058- return (struct thread_info *)
12059- (current_stack_pointer & ~(THREAD_SIZE - 1));
12060-}
12061-
12062-#else /* !__ASSEMBLY__ */
12063-
12064+#ifdef __ASSEMBLY__
12065 /* how to get the thread information struct from ASM */
12066 #define GET_THREAD_INFO(reg) \
12067- movl $-THREAD_SIZE, reg; \
12068- andl %esp, reg
12069+ mov PER_CPU_VAR(current_tinfo), reg
12070
12071 /* use this one if reg already contains %esp */
12072-#define GET_THREAD_INFO_WITH_ESP(reg) \
12073- andl $-THREAD_SIZE, reg
12074+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
12075+#else
12076+/* how to get the thread information struct from C */
12077+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
12078+
12079+static __always_inline struct thread_info *current_thread_info(void)
12080+{
12081+ return percpu_read_stable(current_tinfo);
12082+}
12083+#endif
12084+
12085+#ifdef CONFIG_X86_32
12086+
12087+#define STACK_WARN (THREAD_SIZE/8)
12088+/*
12089+ * macros/functions for gaining access to the thread information structure
12090+ *
12091+ * preempt_count needs to be 1 initially, until the scheduler is functional.
12092+ */
12093+#ifndef __ASSEMBLY__
12094+
12095+/* how to get the current stack pointer from C */
12096+register unsigned long current_stack_pointer asm("esp") __used;
12097
12098 #endif
12099
12100 #else /* X86_32 */
12101
12102-#include <asm/percpu.h>
12103-#define KERNEL_STACK_OFFSET (5*8)
12104-
12105 /*
12106 * macros/functions for gaining access to the thread information structure
12107 * preempt_count needs to be 1 initially, until the scheduler is functional.
12108@@ -209,21 +198,8 @@ static inline struct thread_info *current_thread_info(void)
12109 #ifndef __ASSEMBLY__
12110 DECLARE_PER_CPU(unsigned long, kernel_stack);
12111
12112-static inline struct thread_info *current_thread_info(void)
12113-{
12114- struct thread_info *ti;
12115- ti = (void *)(percpu_read_stable(kernel_stack) +
12116- KERNEL_STACK_OFFSET - THREAD_SIZE);
12117- return ti;
12118-}
12119-
12120-#else /* !__ASSEMBLY__ */
12121-
12122-/* how to get the thread information struct from ASM */
12123-#define GET_THREAD_INFO(reg) \
12124- movq PER_CPU_VAR(kernel_stack),reg ; \
12125- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
12126-
12127+/* how to get the current stack pointer from C */
12128+register unsigned long current_stack_pointer asm("rsp") __used;
12129 #endif
12130
12131 #endif /* !X86_32 */
12132@@ -260,5 +236,16 @@ extern void arch_task_cache_init(void);
12133 extern void free_thread_info(struct thread_info *ti);
12134 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
12135 #define arch_task_cache_init arch_task_cache_init
12136+
12137+#define __HAVE_THREAD_FUNCTIONS
12138+#define task_thread_info(task) (&(task)->tinfo)
12139+#define task_stack_page(task) ((task)->stack)
12140+#define setup_thread_stack(p, org) do {} while (0)
12141+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
12142+
12143+#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
12144+extern struct task_struct *alloc_task_struct(void);
12145+extern void free_task_struct(struct task_struct *);
12146+
12147 #endif
12148 #endif /* _ASM_X86_THREAD_INFO_H */
12149diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
12150index 61c5874..8a046e9 100644
12151--- a/arch/x86/include/asm/uaccess.h
12152+++ b/arch/x86/include/asm/uaccess.h
12153@@ -8,12 +8,15 @@
12154 #include <linux/thread_info.h>
12155 #include <linux/prefetch.h>
12156 #include <linux/string.h>
12157+#include <linux/sched.h>
12158 #include <asm/asm.h>
12159 #include <asm/page.h>
12160
12161 #define VERIFY_READ 0
12162 #define VERIFY_WRITE 1
12163
12164+extern void check_object_size(const void *ptr, unsigned long n, bool to);
12165+
12166 /*
12167 * The fs value determines whether argument validity checking should be
12168 * performed or not. If get_fs() == USER_DS, checking is performed, with
12169@@ -29,7 +32,12 @@
12170
12171 #define get_ds() (KERNEL_DS)
12172 #define get_fs() (current_thread_info()->addr_limit)
12173+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12174+void __set_fs(mm_segment_t x);
12175+void set_fs(mm_segment_t x);
12176+#else
12177 #define set_fs(x) (current_thread_info()->addr_limit = (x))
12178+#endif
12179
12180 #define segment_eq(a, b) ((a).seg == (b).seg)
12181
12182@@ -77,7 +85,33 @@
12183 * checks that the pointer is in the user space range - after calling
12184 * this function, memory access functions may still return -EFAULT.
12185 */
12186-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12187+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12188+#define access_ok(type, addr, size) \
12189+({ \
12190+ long __size = size; \
12191+ unsigned long __addr = (unsigned long)addr; \
12192+ unsigned long __addr_ao = __addr & PAGE_MASK; \
12193+ unsigned long __end_ao = __addr + __size - 1; \
12194+ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
12195+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
12196+ while(__addr_ao <= __end_ao) { \
12197+ char __c_ao; \
12198+ __addr_ao += PAGE_SIZE; \
12199+ if (__size > PAGE_SIZE) \
12200+ cond_resched(); \
12201+ if (__get_user(__c_ao, (char __user *)__addr)) \
12202+ break; \
12203+ if (type != VERIFY_WRITE) { \
12204+ __addr = __addr_ao; \
12205+ continue; \
12206+ } \
12207+ if (__put_user(__c_ao, (char __user *)__addr)) \
12208+ break; \
12209+ __addr = __addr_ao; \
12210+ } \
12211+ } \
12212+ __ret_ao; \
12213+})
12214
12215 /*
12216 * The exception table consists of pairs of addresses: the first is the
12217@@ -183,12 +217,20 @@ extern int __get_user_bad(void);
12218 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
12219 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
12220
12221-
12222+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12223+#define __copyuser_seg "gs;"
12224+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
12225+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
12226+#else
12227+#define __copyuser_seg
12228+#define __COPYUSER_SET_ES
12229+#define __COPYUSER_RESTORE_ES
12230+#endif
12231
12232 #ifdef CONFIG_X86_32
12233 #define __put_user_asm_u64(x, addr, err, errret) \
12234- asm volatile("1: movl %%eax,0(%2)\n" \
12235- "2: movl %%edx,4(%2)\n" \
12236+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
12237+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
12238 "3:\n" \
12239 ".section .fixup,\"ax\"\n" \
12240 "4: movl %3,%0\n" \
12241@@ -200,8 +242,8 @@ extern int __get_user_bad(void);
12242 : "A" (x), "r" (addr), "i" (errret), "0" (err))
12243
12244 #define __put_user_asm_ex_u64(x, addr) \
12245- asm volatile("1: movl %%eax,0(%1)\n" \
12246- "2: movl %%edx,4(%1)\n" \
12247+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
12248+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
12249 "3:\n" \
12250 _ASM_EXTABLE(1b, 2b - 1b) \
12251 _ASM_EXTABLE(2b, 3b - 2b) \
12252@@ -253,7 +295,7 @@ extern void __put_user_8(void);
12253 __typeof__(*(ptr)) __pu_val; \
12254 __chk_user_ptr(ptr); \
12255 might_fault(); \
12256- __pu_val = x; \
12257+ __pu_val = (x); \
12258 switch (sizeof(*(ptr))) { \
12259 case 1: \
12260 __put_user_x(1, __pu_val, ptr, __ret_pu); \
12261@@ -374,7 +416,7 @@ do { \
12262 } while (0)
12263
12264 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12265- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
12266+ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
12267 "2:\n" \
12268 ".section .fixup,\"ax\"\n" \
12269 "3: mov %3,%0\n" \
12270@@ -382,7 +424,7 @@ do { \
12271 " jmp 2b\n" \
12272 ".previous\n" \
12273 _ASM_EXTABLE(1b, 3b) \
12274- : "=r" (err), ltype(x) \
12275+ : "=r" (err), ltype (x) \
12276 : "m" (__m(addr)), "i" (errret), "0" (err))
12277
12278 #define __get_user_size_ex(x, ptr, size) \
12279@@ -407,7 +449,7 @@ do { \
12280 } while (0)
12281
12282 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
12283- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
12284+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
12285 "2:\n" \
12286 _ASM_EXTABLE(1b, 2b - 1b) \
12287 : ltype(x) : "m" (__m(addr)))
12288@@ -424,13 +466,24 @@ do { \
12289 int __gu_err; \
12290 unsigned long __gu_val; \
12291 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
12292- (x) = (__force __typeof__(*(ptr)))__gu_val; \
12293+ (x) = (__typeof__(*(ptr)))__gu_val; \
12294 __gu_err; \
12295 })
12296
12297 /* FIXME: this hack is definitely wrong -AK */
12298 struct __large_struct { unsigned long buf[100]; };
12299-#define __m(x) (*(struct __large_struct __user *)(x))
12300+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12301+#define ____m(x) \
12302+({ \
12303+ unsigned long ____x = (unsigned long)(x); \
12304+ if (____x < PAX_USER_SHADOW_BASE) \
12305+ ____x += PAX_USER_SHADOW_BASE; \
12306+ (void __user *)____x; \
12307+})
12308+#else
12309+#define ____m(x) (x)
12310+#endif
12311+#define __m(x) (*(struct __large_struct __user *)____m(x))
12312
12313 /*
12314 * Tell gcc we read from memory instead of writing: this is because
12315@@ -438,7 +491,7 @@ struct __large_struct { unsigned long buf[100]; };
12316 * aliasing issues.
12317 */
12318 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12319- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
12320+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
12321 "2:\n" \
12322 ".section .fixup,\"ax\"\n" \
12323 "3: mov %3,%0\n" \
12324@@ -446,10 +499,10 @@ struct __large_struct { unsigned long buf[100]; };
12325 ".previous\n" \
12326 _ASM_EXTABLE(1b, 3b) \
12327 : "=r"(err) \
12328- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
12329+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
12330
12331 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
12332- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
12333+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
12334 "2:\n" \
12335 _ASM_EXTABLE(1b, 2b - 1b) \
12336 : : ltype(x), "m" (__m(addr)))
12337@@ -488,8 +541,12 @@ struct __large_struct { unsigned long buf[100]; };
12338 * On error, the variable @x is set to zero.
12339 */
12340
12341+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12342+#define __get_user(x, ptr) get_user((x), (ptr))
12343+#else
12344 #define __get_user(x, ptr) \
12345 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
12346+#endif
12347
12348 /**
12349 * __put_user: - Write a simple value into user space, with less checking.
12350@@ -511,8 +568,12 @@ struct __large_struct { unsigned long buf[100]; };
12351 * Returns zero on success, or -EFAULT on error.
12352 */
12353
12354+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12355+#define __put_user(x, ptr) put_user((x), (ptr))
12356+#else
12357 #define __put_user(x, ptr) \
12358 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
12359+#endif
12360
12361 #define __get_user_unaligned __get_user
12362 #define __put_user_unaligned __put_user
12363@@ -530,7 +591,7 @@ struct __large_struct { unsigned long buf[100]; };
12364 #define get_user_ex(x, ptr) do { \
12365 unsigned long __gue_val; \
12366 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
12367- (x) = (__force __typeof__(*(ptr)))__gue_val; \
12368+ (x) = (__typeof__(*(ptr)))__gue_val; \
12369 } while (0)
12370
12371 #ifdef CONFIG_X86_WP_WORKS_OK
12372@@ -567,6 +628,7 @@ extern struct movsl_mask {
12373
12374 #define ARCH_HAS_NOCACHE_UACCESS 1
12375
12376+#define ARCH_HAS_SORT_EXTABLE
12377 #ifdef CONFIG_X86_32
12378 # include "uaccess_32.h"
12379 #else
12380diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
12381index 632fb44..e30e334 100644
12382--- a/arch/x86/include/asm/uaccess_32.h
12383+++ b/arch/x86/include/asm/uaccess_32.h
12384@@ -44,6 +44,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
12385 static __always_inline unsigned long __must_check
12386 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12387 {
12388+ pax_track_stack();
12389+
12390+ if ((long)n < 0)
12391+ return n;
12392+
12393 if (__builtin_constant_p(n)) {
12394 unsigned long ret;
12395
12396@@ -62,6 +67,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12397 return ret;
12398 }
12399 }
12400+ if (!__builtin_constant_p(n))
12401+ check_object_size(from, n, true);
12402 return __copy_to_user_ll(to, from, n);
12403 }
12404
12405@@ -83,12 +90,16 @@ static __always_inline unsigned long __must_check
12406 __copy_to_user(void __user *to, const void *from, unsigned long n)
12407 {
12408 might_fault();
12409+
12410 return __copy_to_user_inatomic(to, from, n);
12411 }
12412
12413 static __always_inline unsigned long
12414 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
12415 {
12416+ if ((long)n < 0)
12417+ return n;
12418+
12419 /* Avoid zeroing the tail if the copy fails..
12420 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
12421 * but as the zeroing behaviour is only significant when n is not
12422@@ -138,6 +149,12 @@ static __always_inline unsigned long
12423 __copy_from_user(void *to, const void __user *from, unsigned long n)
12424 {
12425 might_fault();
12426+
12427+ pax_track_stack();
12428+
12429+ if ((long)n < 0)
12430+ return n;
12431+
12432 if (__builtin_constant_p(n)) {
12433 unsigned long ret;
12434
12435@@ -153,6 +170,8 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
12436 return ret;
12437 }
12438 }
12439+ if (!__builtin_constant_p(n))
12440+ check_object_size(to, n, false);
12441 return __copy_from_user_ll(to, from, n);
12442 }
12443
12444@@ -160,6 +179,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
12445 const void __user *from, unsigned long n)
12446 {
12447 might_fault();
12448+
12449+ if ((long)n < 0)
12450+ return n;
12451+
12452 if (__builtin_constant_p(n)) {
12453 unsigned long ret;
12454
12455@@ -182,14 +205,62 @@ static __always_inline unsigned long
12456 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
12457 unsigned long n)
12458 {
12459- return __copy_from_user_ll_nocache_nozero(to, from, n);
12460+ if ((long)n < 0)
12461+ return n;
12462+
12463+ return __copy_from_user_ll_nocache_nozero(to, from, n);
12464+}
12465+
12466+/**
12467+ * copy_to_user: - Copy a block of data into user space.
12468+ * @to: Destination address, in user space.
12469+ * @from: Source address, in kernel space.
12470+ * @n: Number of bytes to copy.
12471+ *
12472+ * Context: User context only. This function may sleep.
12473+ *
12474+ * Copy data from kernel space to user space.
12475+ *
12476+ * Returns number of bytes that could not be copied.
12477+ * On success, this will be zero.
12478+ */
12479+static __always_inline unsigned long __must_check
12480+copy_to_user(void __user *to, const void *from, unsigned long n)
12481+{
12482+ if (access_ok(VERIFY_WRITE, to, n))
12483+ n = __copy_to_user(to, from, n);
12484+ return n;
12485+}
12486+
12487+/**
12488+ * copy_from_user: - Copy a block of data from user space.
12489+ * @to: Destination address, in kernel space.
12490+ * @from: Source address, in user space.
12491+ * @n: Number of bytes to copy.
12492+ *
12493+ * Context: User context only. This function may sleep.
12494+ *
12495+ * Copy data from user space to kernel space.
12496+ *
12497+ * Returns number of bytes that could not be copied.
12498+ * On success, this will be zero.
12499+ *
12500+ * If some data could not be copied, this function will pad the copied
12501+ * data to the requested size using zero bytes.
12502+ */
12503+static __always_inline unsigned long __must_check
12504+copy_from_user(void *to, const void __user *from, unsigned long n)
12505+{
12506+ if (access_ok(VERIFY_READ, from, n))
12507+ n = __copy_from_user(to, from, n);
12508+ else if ((long)n > 0) {
12509+ if (!__builtin_constant_p(n))
12510+ check_object_size(to, n, false);
12511+ memset(to, 0, n);
12512+ }
12513+ return n;
12514 }
12515
12516-unsigned long __must_check copy_to_user(void __user *to,
12517- const void *from, unsigned long n);
12518-unsigned long __must_check copy_from_user(void *to,
12519- const void __user *from,
12520- unsigned long n);
12521 long __must_check strncpy_from_user(char *dst, const char __user *src,
12522 long count);
12523 long __must_check __strncpy_from_user(char *dst,
12524diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
12525index db24b21..f595ae7 100644
12526--- a/arch/x86/include/asm/uaccess_64.h
12527+++ b/arch/x86/include/asm/uaccess_64.h
12528@@ -9,6 +9,9 @@
12529 #include <linux/prefetch.h>
12530 #include <linux/lockdep.h>
12531 #include <asm/page.h>
12532+#include <asm/pgtable.h>
12533+
12534+#define set_fs(x) (current_thread_info()->addr_limit = (x))
12535
12536 /*
12537 * Copy To/From Userspace
12538@@ -16,116 +19,205 @@
12539
12540 /* Handles exceptions in both to and from, but doesn't do access_ok */
12541 __must_check unsigned long
12542-copy_user_generic(void *to, const void *from, unsigned len);
12543+copy_user_generic(void *to, const void *from, unsigned long len);
12544
12545 __must_check unsigned long
12546-copy_to_user(void __user *to, const void *from, unsigned len);
12547-__must_check unsigned long
12548-copy_from_user(void *to, const void __user *from, unsigned len);
12549-__must_check unsigned long
12550-copy_in_user(void __user *to, const void __user *from, unsigned len);
12551+copy_in_user(void __user *to, const void __user *from, unsigned long len);
12552
12553 static __always_inline __must_check
12554-int __copy_from_user(void *dst, const void __user *src, unsigned size)
12555+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
12556 {
12557- int ret = 0;
12558+ unsigned ret = 0;
12559
12560 might_fault();
12561- if (!__builtin_constant_p(size))
12562- return copy_user_generic(dst, (__force void *)src, size);
12563+
12564+ if (size > INT_MAX)
12565+ return size;
12566+
12567+#ifdef CONFIG_PAX_MEMORY_UDEREF
12568+ if (!__access_ok(VERIFY_READ, src, size))
12569+ return size;
12570+#endif
12571+
12572+ if (!__builtin_constant_p(size)) {
12573+ check_object_size(dst, size, false);
12574+
12575+#ifdef CONFIG_PAX_MEMORY_UDEREF
12576+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12577+ src += PAX_USER_SHADOW_BASE;
12578+#endif
12579+
12580+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12581+ }
12582 switch (size) {
12583- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
12584+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
12585 ret, "b", "b", "=q", 1);
12586 return ret;
12587- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
12588+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
12589 ret, "w", "w", "=r", 2);
12590 return ret;
12591- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
12592+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
12593 ret, "l", "k", "=r", 4);
12594 return ret;
12595- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
12596+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12597 ret, "q", "", "=r", 8);
12598 return ret;
12599 case 10:
12600- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12601+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12602 ret, "q", "", "=r", 10);
12603 if (unlikely(ret))
12604 return ret;
12605 __get_user_asm(*(u16 *)(8 + (char *)dst),
12606- (u16 __user *)(8 + (char __user *)src),
12607+ (const u16 __user *)(8 + (const char __user *)src),
12608 ret, "w", "w", "=r", 2);
12609 return ret;
12610 case 16:
12611- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12612+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12613 ret, "q", "", "=r", 16);
12614 if (unlikely(ret))
12615 return ret;
12616 __get_user_asm(*(u64 *)(8 + (char *)dst),
12617- (u64 __user *)(8 + (char __user *)src),
12618+ (const u64 __user *)(8 + (const char __user *)src),
12619 ret, "q", "", "=r", 8);
12620 return ret;
12621 default:
12622- return copy_user_generic(dst, (__force void *)src, size);
12623+
12624+#ifdef CONFIG_PAX_MEMORY_UDEREF
12625+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12626+ src += PAX_USER_SHADOW_BASE;
12627+#endif
12628+
12629+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12630 }
12631 }
12632
12633 static __always_inline __must_check
12634-int __copy_to_user(void __user *dst, const void *src, unsigned size)
12635+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
12636 {
12637- int ret = 0;
12638+ unsigned ret = 0;
12639
12640 might_fault();
12641- if (!__builtin_constant_p(size))
12642- return copy_user_generic((__force void *)dst, src, size);
12643+
12644+ pax_track_stack();
12645+
12646+ if (size > INT_MAX)
12647+ return size;
12648+
12649+#ifdef CONFIG_PAX_MEMORY_UDEREF
12650+ if (!__access_ok(VERIFY_WRITE, dst, size))
12651+ return size;
12652+#endif
12653+
12654+ if (!__builtin_constant_p(size)) {
12655+ check_object_size(src, size, true);
12656+
12657+#ifdef CONFIG_PAX_MEMORY_UDEREF
12658+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12659+ dst += PAX_USER_SHADOW_BASE;
12660+#endif
12661+
12662+ return copy_user_generic((__force_kernel void *)dst, src, size);
12663+ }
12664 switch (size) {
12665- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
12666+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
12667 ret, "b", "b", "iq", 1);
12668 return ret;
12669- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
12670+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
12671 ret, "w", "w", "ir", 2);
12672 return ret;
12673- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
12674+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
12675 ret, "l", "k", "ir", 4);
12676 return ret;
12677- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
12678+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12679 ret, "q", "", "er", 8);
12680 return ret;
12681 case 10:
12682- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12683+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12684 ret, "q", "", "er", 10);
12685 if (unlikely(ret))
12686 return ret;
12687 asm("":::"memory");
12688- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
12689+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
12690 ret, "w", "w", "ir", 2);
12691 return ret;
12692 case 16:
12693- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12694+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12695 ret, "q", "", "er", 16);
12696 if (unlikely(ret))
12697 return ret;
12698 asm("":::"memory");
12699- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
12700+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
12701 ret, "q", "", "er", 8);
12702 return ret;
12703 default:
12704- return copy_user_generic((__force void *)dst, src, size);
12705+
12706+#ifdef CONFIG_PAX_MEMORY_UDEREF
12707+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12708+ dst += PAX_USER_SHADOW_BASE;
12709+#endif
12710+
12711+ return copy_user_generic((__force_kernel void *)dst, src, size);
12712+ }
12713+}
12714+
12715+static __always_inline __must_check
12716+unsigned long copy_to_user(void __user *to, const void *from, unsigned long len)
12717+{
12718+ if (access_ok(VERIFY_WRITE, to, len))
12719+ len = __copy_to_user(to, from, len);
12720+ return len;
12721+}
12722+
12723+static __always_inline __must_check
12724+unsigned long copy_from_user(void *to, const void __user *from, unsigned long len)
12725+{
12726+ might_fault();
12727+
12728+ if (access_ok(VERIFY_READ, from, len))
12729+ len = __copy_from_user(to, from, len);
12730+ else if (len < INT_MAX) {
12731+ if (!__builtin_constant_p(len))
12732+ check_object_size(to, len, false);
12733+ memset(to, 0, len);
12734 }
12735+ return len;
12736 }
12737
12738 static __always_inline __must_check
12739-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12740+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
12741 {
12742- int ret = 0;
12743+ unsigned ret = 0;
12744
12745 might_fault();
12746- if (!__builtin_constant_p(size))
12747- return copy_user_generic((__force void *)dst,
12748- (__force void *)src, size);
12749+
12750+ pax_track_stack();
12751+
12752+ if (size > INT_MAX)
12753+ return size;
12754+
12755+#ifdef CONFIG_PAX_MEMORY_UDEREF
12756+ if (!__access_ok(VERIFY_READ, src, size))
12757+ return size;
12758+ if (!__access_ok(VERIFY_WRITE, dst, size))
12759+ return size;
12760+#endif
12761+
12762+ if (!__builtin_constant_p(size)) {
12763+
12764+#ifdef CONFIG_PAX_MEMORY_UDEREF
12765+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12766+ src += PAX_USER_SHADOW_BASE;
12767+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12768+ dst += PAX_USER_SHADOW_BASE;
12769+#endif
12770+
12771+ return copy_user_generic((__force_kernel void *)dst,
12772+ (__force_kernel const void *)src, size);
12773+ }
12774 switch (size) {
12775 case 1: {
12776 u8 tmp;
12777- __get_user_asm(tmp, (u8 __user *)src,
12778+ __get_user_asm(tmp, (const u8 __user *)src,
12779 ret, "b", "b", "=q", 1);
12780 if (likely(!ret))
12781 __put_user_asm(tmp, (u8 __user *)dst,
12782@@ -134,7 +226,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12783 }
12784 case 2: {
12785 u16 tmp;
12786- __get_user_asm(tmp, (u16 __user *)src,
12787+ __get_user_asm(tmp, (const u16 __user *)src,
12788 ret, "w", "w", "=r", 2);
12789 if (likely(!ret))
12790 __put_user_asm(tmp, (u16 __user *)dst,
12791@@ -144,7 +236,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12792
12793 case 4: {
12794 u32 tmp;
12795- __get_user_asm(tmp, (u32 __user *)src,
12796+ __get_user_asm(tmp, (const u32 __user *)src,
12797 ret, "l", "k", "=r", 4);
12798 if (likely(!ret))
12799 __put_user_asm(tmp, (u32 __user *)dst,
12800@@ -153,7 +245,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12801 }
12802 case 8: {
12803 u64 tmp;
12804- __get_user_asm(tmp, (u64 __user *)src,
12805+ __get_user_asm(tmp, (const u64 __user *)src,
12806 ret, "q", "", "=r", 8);
12807 if (likely(!ret))
12808 __put_user_asm(tmp, (u64 __user *)dst,
12809@@ -161,8 +253,16 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12810 return ret;
12811 }
12812 default:
12813- return copy_user_generic((__force void *)dst,
12814- (__force void *)src, size);
12815+
12816+#ifdef CONFIG_PAX_MEMORY_UDEREF
12817+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12818+ src += PAX_USER_SHADOW_BASE;
12819+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12820+ dst += PAX_USER_SHADOW_BASE;
12821+#endif
12822+
12823+ return copy_user_generic((__force_kernel void *)dst,
12824+ (__force_kernel const void *)src, size);
12825 }
12826 }
12827
12828@@ -176,33 +276,75 @@ __must_check long strlen_user(const char __user *str);
12829 __must_check unsigned long clear_user(void __user *mem, unsigned long len);
12830 __must_check unsigned long __clear_user(void __user *mem, unsigned long len);
12831
12832-__must_check long __copy_from_user_inatomic(void *dst, const void __user *src,
12833- unsigned size);
12834+static __must_check __always_inline unsigned long
12835+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
12836+{
12837+ pax_track_stack();
12838+
12839+ if (size > INT_MAX)
12840+ return size;
12841+
12842+#ifdef CONFIG_PAX_MEMORY_UDEREF
12843+ if (!__access_ok(VERIFY_READ, src, size))
12844+ return size;
12845
12846-static __must_check __always_inline int
12847-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
12848+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12849+ src += PAX_USER_SHADOW_BASE;
12850+#endif
12851+
12852+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12853+}
12854+
12855+static __must_check __always_inline unsigned long
12856+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
12857 {
12858- return copy_user_generic((__force void *)dst, src, size);
12859+ if (size > INT_MAX)
12860+ return size;
12861+
12862+#ifdef CONFIG_PAX_MEMORY_UDEREF
12863+ if (!__access_ok(VERIFY_WRITE, dst, size))
12864+ return size;
12865+
12866+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12867+ dst += PAX_USER_SHADOW_BASE;
12868+#endif
12869+
12870+ return copy_user_generic((__force_kernel void *)dst, src, size);
12871 }
12872
12873-extern long __copy_user_nocache(void *dst, const void __user *src,
12874- unsigned size, int zerorest);
12875+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
12876+ unsigned long size, int zerorest);
12877
12878-static inline int
12879-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
12880+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
12881 {
12882 might_sleep();
12883+
12884+ if (size > INT_MAX)
12885+ return size;
12886+
12887+#ifdef CONFIG_PAX_MEMORY_UDEREF
12888+ if (!__access_ok(VERIFY_READ, src, size))
12889+ return size;
12890+#endif
12891+
12892 return __copy_user_nocache(dst, src, size, 1);
12893 }
12894
12895-static inline int
12896-__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12897- unsigned size)
12898+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12899+ unsigned long size)
12900 {
12901+ if (size > INT_MAX)
12902+ return size;
12903+
12904+#ifdef CONFIG_PAX_MEMORY_UDEREF
12905+ if (!__access_ok(VERIFY_READ, src, size))
12906+ return size;
12907+#endif
12908+
12909 return __copy_user_nocache(dst, src, size, 0);
12910 }
12911
12912-unsigned long
12913-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
12914+extern unsigned long
12915+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest);
12916
12917 #endif /* _ASM_X86_UACCESS_64_H */
12918diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
12919index 9064052..786cfbc 100644
12920--- a/arch/x86/include/asm/vdso.h
12921+++ b/arch/x86/include/asm/vdso.h
12922@@ -25,7 +25,7 @@ extern const char VDSO32_PRELINK[];
12923 #define VDSO32_SYMBOL(base, name) \
12924 ({ \
12925 extern const char VDSO32_##name[]; \
12926- (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
12927+ (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
12928 })
12929 #endif
12930
12931diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
12932index 3d61e20..9507180 100644
12933--- a/arch/x86/include/asm/vgtod.h
12934+++ b/arch/x86/include/asm/vgtod.h
12935@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
12936 int sysctl_enabled;
12937 struct timezone sys_tz;
12938 struct { /* extract of a clocksource struct */
12939+ char name[8];
12940 cycle_t (*vread)(void);
12941 cycle_t cycle_last;
12942 cycle_t mask;
12943diff --git a/arch/x86/include/asm/vmi.h b/arch/x86/include/asm/vmi.h
12944index 61e08c0..b0da582 100644
12945--- a/arch/x86/include/asm/vmi.h
12946+++ b/arch/x86/include/asm/vmi.h
12947@@ -191,6 +191,7 @@ struct vrom_header {
12948 u8 reserved[96]; /* Reserved for headers */
12949 char vmi_init[8]; /* VMI_Init jump point */
12950 char get_reloc[8]; /* VMI_GetRelocationInfo jump point */
12951+ char rom_data[8048]; /* rest of the option ROM */
12952 } __attribute__((packed));
12953
12954 struct pnp_header {
12955diff --git a/arch/x86/include/asm/vmi_time.h b/arch/x86/include/asm/vmi_time.h
12956index c6e0bee..fcb9f74 100644
12957--- a/arch/x86/include/asm/vmi_time.h
12958+++ b/arch/x86/include/asm/vmi_time.h
12959@@ -43,7 +43,7 @@ extern struct vmi_timer_ops {
12960 int (*wallclock_updated)(void);
12961 void (*set_alarm)(u32 flags, u64 expiry, u64 period);
12962 void (*cancel_alarm)(u32 flags);
12963-} vmi_timer_ops;
12964+} __no_const vmi_timer_ops;
12965
12966 /* Prototypes */
12967 extern void __init vmi_time_init(void);
12968diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h
12969index d0983d2..1f7c9e9 100644
12970--- a/arch/x86/include/asm/vsyscall.h
12971+++ b/arch/x86/include/asm/vsyscall.h
12972@@ -15,9 +15,10 @@ enum vsyscall_num {
12973
12974 #ifdef __KERNEL__
12975 #include <linux/seqlock.h>
12976+#include <linux/getcpu.h>
12977+#include <linux/time.h>
12978
12979 #define __section_vgetcpu_mode __attribute__ ((unused, __section__ (".vgetcpu_mode"), aligned(16)))
12980-#define __section_jiffies __attribute__ ((unused, __section__ (".jiffies"), aligned(16)))
12981
12982 /* Definitions for CONFIG_GENERIC_TIME definitions */
12983 #define __section_vsyscall_gtod_data __attribute__ \
12984@@ -31,7 +32,6 @@ enum vsyscall_num {
12985 #define VGETCPU_LSL 2
12986
12987 extern int __vgetcpu_mode;
12988-extern volatile unsigned long __jiffies;
12989
12990 /* kernel space (writeable) */
12991 extern int vgetcpu_mode;
12992@@ -39,6 +39,9 @@ extern struct timezone sys_tz;
12993
12994 extern void map_vsyscall(void);
12995
12996+extern int vgettimeofday(struct timeval * tv, struct timezone * tz);
12997+extern time_t vtime(time_t *t);
12998+extern long vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache);
12999 #endif /* __KERNEL__ */
13000
13001 #endif /* _ASM_X86_VSYSCALL_H */
13002diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
13003index 2c756fd..3377e37 100644
13004--- a/arch/x86/include/asm/x86_init.h
13005+++ b/arch/x86/include/asm/x86_init.h
13006@@ -28,7 +28,7 @@ struct x86_init_mpparse {
13007 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
13008 void (*find_smp_config)(unsigned int reserve);
13009 void (*get_smp_config)(unsigned int early);
13010-};
13011+} __no_const;
13012
13013 /**
13014 * struct x86_init_resources - platform specific resource related ops
13015@@ -42,7 +42,7 @@ struct x86_init_resources {
13016 void (*probe_roms)(void);
13017 void (*reserve_resources)(void);
13018 char *(*memory_setup)(void);
13019-};
13020+} __no_const;
13021
13022 /**
13023 * struct x86_init_irqs - platform specific interrupt setup
13024@@ -55,7 +55,7 @@ struct x86_init_irqs {
13025 void (*pre_vector_init)(void);
13026 void (*intr_init)(void);
13027 void (*trap_init)(void);
13028-};
13029+} __no_const;
13030
13031 /**
13032 * struct x86_init_oem - oem platform specific customizing functions
13033@@ -65,7 +65,7 @@ struct x86_init_irqs {
13034 struct x86_init_oem {
13035 void (*arch_setup)(void);
13036 void (*banner)(void);
13037-};
13038+} __no_const;
13039
13040 /**
13041 * struct x86_init_paging - platform specific paging functions
13042@@ -75,7 +75,7 @@ struct x86_init_oem {
13043 struct x86_init_paging {
13044 void (*pagetable_setup_start)(pgd_t *base);
13045 void (*pagetable_setup_done)(pgd_t *base);
13046-};
13047+} __no_const;
13048
13049 /**
13050 * struct x86_init_timers - platform specific timer setup
13051@@ -88,7 +88,7 @@ struct x86_init_timers {
13052 void (*setup_percpu_clockev)(void);
13053 void (*tsc_pre_init)(void);
13054 void (*timer_init)(void);
13055-};
13056+} __no_const;
13057
13058 /**
13059 * struct x86_init_ops - functions for platform specific setup
13060@@ -101,7 +101,7 @@ struct x86_init_ops {
13061 struct x86_init_oem oem;
13062 struct x86_init_paging paging;
13063 struct x86_init_timers timers;
13064-};
13065+} __no_const;
13066
13067 /**
13068 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
13069@@ -109,7 +109,7 @@ struct x86_init_ops {
13070 */
13071 struct x86_cpuinit_ops {
13072 void (*setup_percpu_clockev)(void);
13073-};
13074+} __no_const;
13075
13076 /**
13077 * struct x86_platform_ops - platform specific runtime functions
13078@@ -121,7 +121,7 @@ struct x86_platform_ops {
13079 unsigned long (*calibrate_tsc)(void);
13080 unsigned long (*get_wallclock)(void);
13081 int (*set_wallclock)(unsigned long nowtime);
13082-};
13083+} __no_const;
13084
13085 extern struct x86_init_ops x86_init;
13086 extern struct x86_cpuinit_ops x86_cpuinit;
13087diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
13088index 727acc1..554f3eb 100644
13089--- a/arch/x86/include/asm/xsave.h
13090+++ b/arch/x86/include/asm/xsave.h
13091@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct xsave_struct *fx)
13092 static inline int xsave_user(struct xsave_struct __user *buf)
13093 {
13094 int err;
13095+
13096+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13097+ if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
13098+ buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
13099+#endif
13100+
13101 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
13102 "2:\n"
13103 ".section .fixup,\"ax\"\n"
13104@@ -78,10 +84,15 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13105 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
13106 {
13107 int err;
13108- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
13109+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
13110 u32 lmask = mask;
13111 u32 hmask = mask >> 32;
13112
13113+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13114+ if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
13115+ xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
13116+#endif
13117+
13118 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
13119 "2:\n"
13120 ".section .fixup,\"ax\"\n"
13121diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile
13122index 6a564ac..9b1340c 100644
13123--- a/arch/x86/kernel/acpi/realmode/Makefile
13124+++ b/arch/x86/kernel/acpi/realmode/Makefile
13125@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D_WAKEUP -D__KERNEL__ \
13126 $(call cc-option, -fno-stack-protector) \
13127 $(call cc-option, -mpreferred-stack-boundary=2)
13128 KBUILD_CFLAGS += $(call cc-option, -m32)
13129+ifdef CONSTIFY_PLUGIN
13130+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
13131+endif
13132 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
13133 GCOV_PROFILE := n
13134
13135diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S
13136index 580b4e2..d4129e4 100644
13137--- a/arch/x86/kernel/acpi/realmode/wakeup.S
13138+++ b/arch/x86/kernel/acpi/realmode/wakeup.S
13139@@ -91,6 +91,9 @@ _start:
13140 /* Do any other stuff... */
13141
13142 #ifndef CONFIG_64BIT
13143+ /* Recheck NX bit overrides (64bit path does this in trampoline) */
13144+ call verify_cpu
13145+
13146 /* This could also be done in C code... */
13147 movl pmode_cr3, %eax
13148 movl %eax, %cr3
13149@@ -104,7 +107,7 @@ _start:
13150 movl %eax, %ecx
13151 orl %edx, %ecx
13152 jz 1f
13153- movl $0xc0000080, %ecx
13154+ mov $MSR_EFER, %ecx
13155 wrmsr
13156 1:
13157
13158@@ -114,6 +117,7 @@ _start:
13159 movl pmode_cr0, %eax
13160 movl %eax, %cr0
13161 jmp pmode_return
13162+# include "../../verify_cpu.S"
13163 #else
13164 pushw $0
13165 pushw trampoline_segment
13166diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
13167index ca93638..7042f24 100644
13168--- a/arch/x86/kernel/acpi/sleep.c
13169+++ b/arch/x86/kernel/acpi/sleep.c
13170@@ -11,11 +11,12 @@
13171 #include <linux/cpumask.h>
13172 #include <asm/segment.h>
13173 #include <asm/desc.h>
13174+#include <asm/e820.h>
13175
13176 #include "realmode/wakeup.h"
13177 #include "sleep.h"
13178
13179-unsigned long acpi_wakeup_address;
13180+unsigned long acpi_wakeup_address = 0x2000;
13181 unsigned long acpi_realmode_flags;
13182
13183 /* address in low memory of the wakeup routine. */
13184@@ -98,9 +99,13 @@ int acpi_save_state_mem(void)
13185 #else /* CONFIG_64BIT */
13186 header->trampoline_segment = setup_trampoline() >> 4;
13187 #ifdef CONFIG_SMP
13188- stack_start.sp = temp_stack + sizeof(temp_stack);
13189+ stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
13190+
13191+ pax_open_kernel();
13192 early_gdt_descr.address =
13193 (unsigned long)get_cpu_gdt_table(smp_processor_id());
13194+ pax_close_kernel();
13195+
13196 initial_gs = per_cpu_offset(smp_processor_id());
13197 #endif
13198 initial_code = (unsigned long)wakeup_long64;
13199@@ -134,14 +139,8 @@ void __init acpi_reserve_bootmem(void)
13200 return;
13201 }
13202
13203- acpi_realmode = (unsigned long)alloc_bootmem_low(WAKEUP_SIZE);
13204-
13205- if (!acpi_realmode) {
13206- printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
13207- return;
13208- }
13209-
13210- acpi_wakeup_address = virt_to_phys((void *)acpi_realmode);
13211+ reserve_early(acpi_wakeup_address, acpi_wakeup_address + WAKEUP_SIZE, "ACPI Wakeup Code");
13212+ acpi_realmode = (unsigned long)__va(acpi_wakeup_address);;
13213 }
13214
13215
13216diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
13217index 8ded418..079961e 100644
13218--- a/arch/x86/kernel/acpi/wakeup_32.S
13219+++ b/arch/x86/kernel/acpi/wakeup_32.S
13220@@ -30,13 +30,11 @@ wakeup_pmode_return:
13221 # and restore the stack ... but you need gdt for this to work
13222 movl saved_context_esp, %esp
13223
13224- movl %cs:saved_magic, %eax
13225- cmpl $0x12345678, %eax
13226+ cmpl $0x12345678, saved_magic
13227 jne bogus_magic
13228
13229 # jump to place where we left off
13230- movl saved_eip, %eax
13231- jmp *%eax
13232+ jmp *(saved_eip)
13233
13234 bogus_magic:
13235 jmp bogus_magic
13236diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
13237index de7353c..075da5f 100644
13238--- a/arch/x86/kernel/alternative.c
13239+++ b/arch/x86/kernel/alternative.c
13240@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
13241
13242 BUG_ON(p->len > MAX_PATCH_LEN);
13243 /* prep the buffer with the original instructions */
13244- memcpy(insnbuf, p->instr, p->len);
13245+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
13246 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
13247 (unsigned long)p->instr, p->len);
13248
13249@@ -475,7 +475,7 @@ void __init alternative_instructions(void)
13250 if (smp_alt_once)
13251 free_init_pages("SMP alternatives",
13252 (unsigned long)__smp_locks,
13253- (unsigned long)__smp_locks_end);
13254+ PAGE_ALIGN((unsigned long)__smp_locks_end));
13255
13256 restart_nmi();
13257 }
13258@@ -492,13 +492,17 @@ void __init alternative_instructions(void)
13259 * instructions. And on the local CPU you need to be protected again NMI or MCE
13260 * handlers seeing an inconsistent instruction while you patch.
13261 */
13262-static void *__init_or_module text_poke_early(void *addr, const void *opcode,
13263+static void *__kprobes text_poke_early(void *addr, const void *opcode,
13264 size_t len)
13265 {
13266 unsigned long flags;
13267 local_irq_save(flags);
13268- memcpy(addr, opcode, len);
13269+
13270+ pax_open_kernel();
13271+ memcpy(ktla_ktva(addr), opcode, len);
13272 sync_core();
13273+ pax_close_kernel();
13274+
13275 local_irq_restore(flags);
13276 /* Could also do a CLFLUSH here to speed up CPU recovery; but
13277 that causes hangs on some VIA CPUs. */
13278@@ -520,35 +524,21 @@ static void *__init_or_module text_poke_early(void *addr, const void *opcode,
13279 */
13280 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
13281 {
13282- unsigned long flags;
13283- char *vaddr;
13284+ unsigned char *vaddr = ktla_ktva(addr);
13285 struct page *pages[2];
13286- int i;
13287+ size_t i;
13288
13289 if (!core_kernel_text((unsigned long)addr)) {
13290- pages[0] = vmalloc_to_page(addr);
13291- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
13292+ pages[0] = vmalloc_to_page(vaddr);
13293+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
13294 } else {
13295- pages[0] = virt_to_page(addr);
13296+ pages[0] = virt_to_page(vaddr);
13297 WARN_ON(!PageReserved(pages[0]));
13298- pages[1] = virt_to_page(addr + PAGE_SIZE);
13299+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
13300 }
13301 BUG_ON(!pages[0]);
13302- local_irq_save(flags);
13303- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
13304- if (pages[1])
13305- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
13306- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
13307- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
13308- clear_fixmap(FIX_TEXT_POKE0);
13309- if (pages[1])
13310- clear_fixmap(FIX_TEXT_POKE1);
13311- local_flush_tlb();
13312- sync_core();
13313- /* Could also do a CLFLUSH here to speed up CPU recovery; but
13314- that causes hangs on some VIA CPUs. */
13315+ text_poke_early(addr, opcode, len);
13316 for (i = 0; i < len; i++)
13317- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
13318- local_irq_restore(flags);
13319+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
13320 return addr;
13321 }
13322diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
13323index 3a44b75..1601800 100644
13324--- a/arch/x86/kernel/amd_iommu.c
13325+++ b/arch/x86/kernel/amd_iommu.c
13326@@ -2076,7 +2076,7 @@ static void prealloc_protection_domains(void)
13327 }
13328 }
13329
13330-static struct dma_map_ops amd_iommu_dma_ops = {
13331+static const struct dma_map_ops amd_iommu_dma_ops = {
13332 .alloc_coherent = alloc_coherent,
13333 .free_coherent = free_coherent,
13334 .map_page = map_page,
13335diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
13336index 1d2d670..8e3f477 100644
13337--- a/arch/x86/kernel/apic/apic.c
13338+++ b/arch/x86/kernel/apic/apic.c
13339@@ -170,7 +170,7 @@ int first_system_vector = 0xfe;
13340 /*
13341 * Debug level, exported for io_apic.c
13342 */
13343-unsigned int apic_verbosity;
13344+int apic_verbosity;
13345
13346 int pic_mode;
13347
13348@@ -1794,7 +1794,7 @@ void smp_error_interrupt(struct pt_regs *regs)
13349 apic_write(APIC_ESR, 0);
13350 v1 = apic_read(APIC_ESR);
13351 ack_APIC_irq();
13352- atomic_inc(&irq_err_count);
13353+ atomic_inc_unchecked(&irq_err_count);
13354
13355 /*
13356 * Here is what the APIC error bits mean:
13357@@ -2184,6 +2184,8 @@ static int __cpuinit apic_cluster_num(void)
13358 u16 *bios_cpu_apicid;
13359 DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS);
13360
13361+ pax_track_stack();
13362+
13363 bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
13364 bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
13365
13366diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
13367index 8928d97..f799cea 100644
13368--- a/arch/x86/kernel/apic/io_apic.c
13369+++ b/arch/x86/kernel/apic/io_apic.c
13370@@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapic_entries(void)
13371 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
13372 GFP_ATOMIC);
13373 if (!ioapic_entries)
13374- return 0;
13375+ return NULL;
13376
13377 for (apic = 0; apic < nr_ioapics; apic++) {
13378 ioapic_entries[apic] =
13379@@ -733,7 +733,7 @@ nomem:
13380 kfree(ioapic_entries[apic]);
13381 kfree(ioapic_entries);
13382
13383- return 0;
13384+ return NULL;
13385 }
13386
13387 /*
13388@@ -1150,7 +1150,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
13389 }
13390 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
13391
13392-void lock_vector_lock(void)
13393+void lock_vector_lock(void) __acquires(vector_lock)
13394 {
13395 /* Used to the online set of cpus does not change
13396 * during assign_irq_vector.
13397@@ -1158,7 +1158,7 @@ void lock_vector_lock(void)
13398 spin_lock(&vector_lock);
13399 }
13400
13401-void unlock_vector_lock(void)
13402+void unlock_vector_lock(void) __releases(vector_lock)
13403 {
13404 spin_unlock(&vector_lock);
13405 }
13406@@ -2542,7 +2542,7 @@ static void ack_apic_edge(unsigned int irq)
13407 ack_APIC_irq();
13408 }
13409
13410-atomic_t irq_mis_count;
13411+atomic_unchecked_t irq_mis_count;
13412
13413 static void ack_apic_level(unsigned int irq)
13414 {
13415@@ -2626,7 +2626,7 @@ static void ack_apic_level(unsigned int irq)
13416
13417 /* Tail end of version 0x11 I/O APIC bug workaround */
13418 if (!(v & (1 << (i & 0x1f)))) {
13419- atomic_inc(&irq_mis_count);
13420+ atomic_inc_unchecked(&irq_mis_count);
13421 spin_lock(&ioapic_lock);
13422 __mask_and_edge_IO_APIC_irq(cfg);
13423 __unmask_and_level_IO_APIC_irq(cfg);
13424diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
13425index 151ace6..f317474 100644
13426--- a/arch/x86/kernel/apm_32.c
13427+++ b/arch/x86/kernel/apm_32.c
13428@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
13429 * This is for buggy BIOS's that refer to (real mode) segment 0x40
13430 * even though they are called in protected mode.
13431 */
13432-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
13433+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
13434 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
13435
13436 static const char driver_version[] = "1.16ac"; /* no spaces */
13437@@ -588,7 +588,10 @@ static long __apm_bios_call(void *_call)
13438 BUG_ON(cpu != 0);
13439 gdt = get_cpu_gdt_table(cpu);
13440 save_desc_40 = gdt[0x40 / 8];
13441+
13442+ pax_open_kernel();
13443 gdt[0x40 / 8] = bad_bios_desc;
13444+ pax_close_kernel();
13445
13446 apm_irq_save(flags);
13447 APM_DO_SAVE_SEGS;
13448@@ -597,7 +600,11 @@ static long __apm_bios_call(void *_call)
13449 &call->esi);
13450 APM_DO_RESTORE_SEGS;
13451 apm_irq_restore(flags);
13452+
13453+ pax_open_kernel();
13454 gdt[0x40 / 8] = save_desc_40;
13455+ pax_close_kernel();
13456+
13457 put_cpu();
13458
13459 return call->eax & 0xff;
13460@@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void *_call)
13461 BUG_ON(cpu != 0);
13462 gdt = get_cpu_gdt_table(cpu);
13463 save_desc_40 = gdt[0x40 / 8];
13464+
13465+ pax_open_kernel();
13466 gdt[0x40 / 8] = bad_bios_desc;
13467+ pax_close_kernel();
13468
13469 apm_irq_save(flags);
13470 APM_DO_SAVE_SEGS;
13471@@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void *_call)
13472 &call->eax);
13473 APM_DO_RESTORE_SEGS;
13474 apm_irq_restore(flags);
13475+
13476+ pax_open_kernel();
13477 gdt[0x40 / 8] = save_desc_40;
13478+ pax_close_kernel();
13479+
13480 put_cpu();
13481 return error;
13482 }
13483@@ -975,7 +989,7 @@ recalc:
13484
13485 static void apm_power_off(void)
13486 {
13487- unsigned char po_bios_call[] = {
13488+ const unsigned char po_bios_call[] = {
13489 0xb8, 0x00, 0x10, /* movw $0x1000,ax */
13490 0x8e, 0xd0, /* movw ax,ss */
13491 0xbc, 0x00, 0xf0, /* movw $0xf000,sp */
13492@@ -2357,12 +2371,15 @@ static int __init apm_init(void)
13493 * code to that CPU.
13494 */
13495 gdt = get_cpu_gdt_table(0);
13496+
13497+ pax_open_kernel();
13498 set_desc_base(&gdt[APM_CS >> 3],
13499 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
13500 set_desc_base(&gdt[APM_CS_16 >> 3],
13501 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
13502 set_desc_base(&gdt[APM_DS >> 3],
13503 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
13504+ pax_close_kernel();
13505
13506 proc_create("apm", 0, NULL, &apm_file_ops);
13507
13508diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
13509index dfdbf64..9b2b6ce 100644
13510--- a/arch/x86/kernel/asm-offsets_32.c
13511+++ b/arch/x86/kernel/asm-offsets_32.c
13512@@ -51,7 +51,6 @@ void foo(void)
13513 OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
13514 BLANK();
13515
13516- OFFSET(TI_task, thread_info, task);
13517 OFFSET(TI_exec_domain, thread_info, exec_domain);
13518 OFFSET(TI_flags, thread_info, flags);
13519 OFFSET(TI_status, thread_info, status);
13520@@ -60,6 +59,8 @@ void foo(void)
13521 OFFSET(TI_restart_block, thread_info, restart_block);
13522 OFFSET(TI_sysenter_return, thread_info, sysenter_return);
13523 OFFSET(TI_cpu, thread_info, cpu);
13524+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
13525+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
13526 BLANK();
13527
13528 OFFSET(GDS_size, desc_ptr, size);
13529@@ -99,6 +100,7 @@ void foo(void)
13530
13531 DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
13532 DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
13533+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
13534 DEFINE(PTRS_PER_PTE, PTRS_PER_PTE);
13535 DEFINE(PTRS_PER_PMD, PTRS_PER_PMD);
13536 DEFINE(PTRS_PER_PGD, PTRS_PER_PGD);
13537@@ -115,6 +117,11 @@ void foo(void)
13538 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
13539 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
13540 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
13541+
13542+#ifdef CONFIG_PAX_KERNEXEC
13543+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
13544+#endif
13545+
13546 #endif
13547
13548 #ifdef CONFIG_XEN
13549diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
13550index 4a6aeed..371de20 100644
13551--- a/arch/x86/kernel/asm-offsets_64.c
13552+++ b/arch/x86/kernel/asm-offsets_64.c
13553@@ -44,6 +44,8 @@ int main(void)
13554 ENTRY(addr_limit);
13555 ENTRY(preempt_count);
13556 ENTRY(status);
13557+ ENTRY(lowest_stack);
13558+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
13559 #ifdef CONFIG_IA32_EMULATION
13560 ENTRY(sysenter_return);
13561 #endif
13562@@ -63,6 +65,18 @@ int main(void)
13563 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
13564 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
13565 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
13566+
13567+#ifdef CONFIG_PAX_KERNEXEC
13568+ OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
13569+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
13570+#endif
13571+
13572+#ifdef CONFIG_PAX_MEMORY_UDEREF
13573+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
13574+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
13575+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
13576+#endif
13577+
13578 #endif
13579
13580
13581@@ -115,6 +129,7 @@ int main(void)
13582 ENTRY(cr8);
13583 BLANK();
13584 #undef ENTRY
13585+ DEFINE(TSS_size, sizeof(struct tss_struct));
13586 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
13587 BLANK();
13588 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
13589@@ -130,6 +145,7 @@ int main(void)
13590
13591 BLANK();
13592 DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
13593+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
13594 #ifdef CONFIG_XEN
13595 BLANK();
13596 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
13597diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
13598index ff502cc..dc5133e 100644
13599--- a/arch/x86/kernel/cpu/Makefile
13600+++ b/arch/x86/kernel/cpu/Makefile
13601@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
13602 CFLAGS_REMOVE_common.o = -pg
13603 endif
13604
13605-# Make sure load_percpu_segment has no stackprotector
13606-nostackp := $(call cc-option, -fno-stack-protector)
13607-CFLAGS_common.o := $(nostackp)
13608-
13609 obj-y := intel_cacheinfo.o addon_cpuid_features.o
13610 obj-y += proc.o capflags.o powerflags.o common.o
13611 obj-y += vmware.o hypervisor.o sched.o
13612diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
13613index 6e082dc..a0b5f36 100644
13614--- a/arch/x86/kernel/cpu/amd.c
13615+++ b/arch/x86/kernel/cpu/amd.c
13616@@ -602,7 +602,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
13617 unsigned int size)
13618 {
13619 /* AMD errata T13 (order #21922) */
13620- if ((c->x86 == 6)) {
13621+ if (c->x86 == 6) {
13622 /* Duron Rev A0 */
13623 if (c->x86_model == 3 && c->x86_mask == 0)
13624 size = 64;
13625diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
13626index 4e34d10..ba6bc97 100644
13627--- a/arch/x86/kernel/cpu/common.c
13628+++ b/arch/x86/kernel/cpu/common.c
13629@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
13630
13631 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
13632
13633-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
13634-#ifdef CONFIG_X86_64
13635- /*
13636- * We need valid kernel segments for data and code in long mode too
13637- * IRET will check the segment types kkeil 2000/10/28
13638- * Also sysret mandates a special GDT layout
13639- *
13640- * TLS descriptors are currently at a different place compared to i386.
13641- * Hopefully nobody expects them at a fixed place (Wine?)
13642- */
13643- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
13644- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
13645- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
13646- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
13647- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
13648- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
13649-#else
13650- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
13651- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13652- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
13653- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
13654- /*
13655- * Segments used for calling PnP BIOS have byte granularity.
13656- * They code segments and data segments have fixed 64k limits,
13657- * the transfer segment sizes are set at run time.
13658- */
13659- /* 32-bit code */
13660- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13661- /* 16-bit code */
13662- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13663- /* 16-bit data */
13664- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
13665- /* 16-bit data */
13666- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
13667- /* 16-bit data */
13668- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
13669- /*
13670- * The APM segments have byte granularity and their bases
13671- * are set at run time. All have 64k limits.
13672- */
13673- /* 32-bit code */
13674- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13675- /* 16-bit code */
13676- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13677- /* data */
13678- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
13679-
13680- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13681- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13682- GDT_STACK_CANARY_INIT
13683-#endif
13684-} };
13685-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
13686-
13687 static int __init x86_xsave_setup(char *s)
13688 {
13689 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
13690@@ -344,7 +290,7 @@ void switch_to_new_gdt(int cpu)
13691 {
13692 struct desc_ptr gdt_descr;
13693
13694- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
13695+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
13696 gdt_descr.size = GDT_SIZE - 1;
13697 load_gdt(&gdt_descr);
13698 /* Reload the per-cpu base */
13699@@ -798,6 +744,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
13700 /* Filter out anything that depends on CPUID levels we don't have */
13701 filter_cpuid_features(c, true);
13702
13703+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
13704+ setup_clear_cpu_cap(X86_FEATURE_SEP);
13705+#endif
13706+
13707 /* If the model name is still unset, do table lookup. */
13708 if (!c->x86_model_id[0]) {
13709 const char *p;
13710@@ -980,6 +930,9 @@ static __init int setup_disablecpuid(char *arg)
13711 }
13712 __setup("clearcpuid=", setup_disablecpuid);
13713
13714+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
13715+EXPORT_PER_CPU_SYMBOL(current_tinfo);
13716+
13717 #ifdef CONFIG_X86_64
13718 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
13719
13720@@ -995,7 +948,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
13721 EXPORT_PER_CPU_SYMBOL(current_task);
13722
13723 DEFINE_PER_CPU(unsigned long, kernel_stack) =
13724- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
13725+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
13726 EXPORT_PER_CPU_SYMBOL(kernel_stack);
13727
13728 DEFINE_PER_CPU(char *, irq_stack_ptr) =
13729@@ -1060,7 +1013,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
13730 {
13731 memset(regs, 0, sizeof(struct pt_regs));
13732 regs->fs = __KERNEL_PERCPU;
13733- regs->gs = __KERNEL_STACK_CANARY;
13734+ savesegment(gs, regs->gs);
13735
13736 return regs;
13737 }
13738@@ -1101,7 +1054,7 @@ void __cpuinit cpu_init(void)
13739 int i;
13740
13741 cpu = stack_smp_processor_id();
13742- t = &per_cpu(init_tss, cpu);
13743+ t = init_tss + cpu;
13744 orig_ist = &per_cpu(orig_ist, cpu);
13745
13746 #ifdef CONFIG_NUMA
13747@@ -1127,7 +1080,7 @@ void __cpuinit cpu_init(void)
13748 switch_to_new_gdt(cpu);
13749 loadsegment(fs, 0);
13750
13751- load_idt((const struct desc_ptr *)&idt_descr);
13752+ load_idt(&idt_descr);
13753
13754 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
13755 syscall_init();
13756@@ -1136,7 +1089,6 @@ void __cpuinit cpu_init(void)
13757 wrmsrl(MSR_KERNEL_GS_BASE, 0);
13758 barrier();
13759
13760- check_efer();
13761 if (cpu != 0)
13762 enable_x2apic();
13763
13764@@ -1199,7 +1151,7 @@ void __cpuinit cpu_init(void)
13765 {
13766 int cpu = smp_processor_id();
13767 struct task_struct *curr = current;
13768- struct tss_struct *t = &per_cpu(init_tss, cpu);
13769+ struct tss_struct *t = init_tss + cpu;
13770 struct thread_struct *thread = &curr->thread;
13771
13772 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
13773diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
13774index 6a77cca..4f4fca0 100644
13775--- a/arch/x86/kernel/cpu/intel.c
13776+++ b/arch/x86/kernel/cpu/intel.c
13777@@ -162,7 +162,7 @@ static void __cpuinit trap_init_f00f_bug(void)
13778 * Update the IDT descriptor and reload the IDT so that
13779 * it uses the read-only mapped virtual address.
13780 */
13781- idt_descr.address = fix_to_virt(FIX_F00F_IDT);
13782+ idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
13783 load_idt(&idt_descr);
13784 }
13785 #endif
13786diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
13787index 417990f..96dc36b 100644
13788--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
13789+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
13790@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr,
13791 return ret;
13792 }
13793
13794-static struct sysfs_ops sysfs_ops = {
13795+static const struct sysfs_ops sysfs_ops = {
13796 .show = show,
13797 .store = store,
13798 };
13799diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13800index 472763d..9831e11 100644
13801--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
13802+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13803@@ -211,7 +211,9 @@ static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13804 static int inject_init(void)
13805 {
13806 printk(KERN_INFO "Machine check injector initialized\n");
13807- mce_chrdev_ops.write = mce_write;
13808+ pax_open_kernel();
13809+ *(void **)&mce_chrdev_ops.write = mce_write;
13810+ pax_close_kernel();
13811 register_die_notifier(&mce_raise_nb);
13812 return 0;
13813 }
13814diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
13815index 0f16a2b..21740f5 100644
13816--- a/arch/x86/kernel/cpu/mcheck/mce.c
13817+++ b/arch/x86/kernel/cpu/mcheck/mce.c
13818@@ -43,6 +43,7 @@
13819 #include <asm/ipi.h>
13820 #include <asm/mce.h>
13821 #include <asm/msr.h>
13822+#include <asm/local.h>
13823
13824 #include "mce-internal.h"
13825
13826@@ -187,7 +188,7 @@ static void print_mce(struct mce *m)
13827 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
13828 m->cs, m->ip);
13829
13830- if (m->cs == __KERNEL_CS)
13831+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
13832 print_symbol("{%s}", m->ip);
13833 pr_cont("\n");
13834 }
13835@@ -221,10 +222,10 @@ static void print_mce_tail(void)
13836
13837 #define PANIC_TIMEOUT 5 /* 5 seconds */
13838
13839-static atomic_t mce_paniced;
13840+static atomic_unchecked_t mce_paniced;
13841
13842 static int fake_panic;
13843-static atomic_t mce_fake_paniced;
13844+static atomic_unchecked_t mce_fake_paniced;
13845
13846 /* Panic in progress. Enable interrupts and wait for final IPI */
13847 static void wait_for_panic(void)
13848@@ -248,7 +249,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13849 /*
13850 * Make sure only one CPU runs in machine check panic
13851 */
13852- if (atomic_inc_return(&mce_paniced) > 1)
13853+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
13854 wait_for_panic();
13855 barrier();
13856
13857@@ -256,7 +257,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13858 console_verbose();
13859 } else {
13860 /* Don't log too much for fake panic */
13861- if (atomic_inc_return(&mce_fake_paniced) > 1)
13862+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
13863 return;
13864 }
13865 print_mce_head();
13866@@ -616,7 +617,7 @@ static int mce_timed_out(u64 *t)
13867 * might have been modified by someone else.
13868 */
13869 rmb();
13870- if (atomic_read(&mce_paniced))
13871+ if (atomic_read_unchecked(&mce_paniced))
13872 wait_for_panic();
13873 if (!monarch_timeout)
13874 goto out;
13875@@ -1394,7 +1395,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
13876 }
13877
13878 /* Call the installed machine check handler for this CPU setup. */
13879-void (*machine_check_vector)(struct pt_regs *, long error_code) =
13880+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
13881 unexpected_machine_check;
13882
13883 /*
13884@@ -1416,7 +1417,9 @@ void __cpuinit mcheck_init(struct cpuinfo_x86 *c)
13885 return;
13886 }
13887
13888+ pax_open_kernel();
13889 machine_check_vector = do_machine_check;
13890+ pax_close_kernel();
13891
13892 mce_init();
13893 mce_cpu_features(c);
13894@@ -1429,14 +1432,14 @@ void __cpuinit mcheck_init(struct cpuinfo_x86 *c)
13895 */
13896
13897 static DEFINE_SPINLOCK(mce_state_lock);
13898-static int open_count; /* #times opened */
13899+static local_t open_count; /* #times opened */
13900 static int open_exclu; /* already open exclusive? */
13901
13902 static int mce_open(struct inode *inode, struct file *file)
13903 {
13904 spin_lock(&mce_state_lock);
13905
13906- if (open_exclu || (open_count && (file->f_flags & O_EXCL))) {
13907+ if (open_exclu || (local_read(&open_count) && (file->f_flags & O_EXCL))) {
13908 spin_unlock(&mce_state_lock);
13909
13910 return -EBUSY;
13911@@ -1444,7 +1447,7 @@ static int mce_open(struct inode *inode, struct file *file)
13912
13913 if (file->f_flags & O_EXCL)
13914 open_exclu = 1;
13915- open_count++;
13916+ local_inc(&open_count);
13917
13918 spin_unlock(&mce_state_lock);
13919
13920@@ -1455,7 +1458,7 @@ static int mce_release(struct inode *inode, struct file *file)
13921 {
13922 spin_lock(&mce_state_lock);
13923
13924- open_count--;
13925+ local_dec(&open_count);
13926 open_exclu = 0;
13927
13928 spin_unlock(&mce_state_lock);
13929@@ -2082,7 +2085,7 @@ struct dentry *mce_get_debugfs_dir(void)
13930 static void mce_reset(void)
13931 {
13932 cpu_missing = 0;
13933- atomic_set(&mce_fake_paniced, 0);
13934+ atomic_set_unchecked(&mce_fake_paniced, 0);
13935 atomic_set(&mce_executing, 0);
13936 atomic_set(&mce_callin, 0);
13937 atomic_set(&global_nwo, 0);
13938diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
13939index ef3cd31..9d2f6ab 100644
13940--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
13941+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
13942@@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr,
13943 return ret;
13944 }
13945
13946-static struct sysfs_ops threshold_ops = {
13947+static const struct sysfs_ops threshold_ops = {
13948 .show = show,
13949 .store = store,
13950 };
13951diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
13952index 5c0e653..0882b0a 100644
13953--- a/arch/x86/kernel/cpu/mcheck/p5.c
13954+++ b/arch/x86/kernel/cpu/mcheck/p5.c
13955@@ -12,6 +12,7 @@
13956 #include <asm/system.h>
13957 #include <asm/mce.h>
13958 #include <asm/msr.h>
13959+#include <asm/pgtable.h>
13960
13961 /* By default disabled */
13962 int mce_p5_enabled __read_mostly;
13963@@ -50,7 +51,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
13964 if (!cpu_has(c, X86_FEATURE_MCE))
13965 return;
13966
13967+ pax_open_kernel();
13968 machine_check_vector = pentium_machine_check;
13969+ pax_close_kernel();
13970 /* Make sure the vector pointer is visible before we enable MCEs: */
13971 wmb();
13972
13973diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
13974index 54060f5..c1a7577 100644
13975--- a/arch/x86/kernel/cpu/mcheck/winchip.c
13976+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
13977@@ -11,6 +11,7 @@
13978 #include <asm/system.h>
13979 #include <asm/mce.h>
13980 #include <asm/msr.h>
13981+#include <asm/pgtable.h>
13982
13983 /* Machine check handler for WinChip C6: */
13984 static void winchip_machine_check(struct pt_regs *regs, long error_code)
13985@@ -24,7 +25,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
13986 {
13987 u32 lo, hi;
13988
13989+ pax_open_kernel();
13990 machine_check_vector = winchip_machine_check;
13991+ pax_close_kernel();
13992 /* Make sure the vector pointer is visible before we enable MCEs: */
13993 wmb();
13994
13995diff --git a/arch/x86/kernel/cpu/mtrr/amd.c b/arch/x86/kernel/cpu/mtrr/amd.c
13996index 33af141..92ba9cd 100644
13997--- a/arch/x86/kernel/cpu/mtrr/amd.c
13998+++ b/arch/x86/kernel/cpu/mtrr/amd.c
13999@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base, unsigned long size, unsigned int type)
14000 return 0;
14001 }
14002
14003-static struct mtrr_ops amd_mtrr_ops = {
14004+static const struct mtrr_ops amd_mtrr_ops = {
14005 .vendor = X86_VENDOR_AMD,
14006 .set = amd_set_mtrr,
14007 .get = amd_get_mtrr,
14008diff --git a/arch/x86/kernel/cpu/mtrr/centaur.c b/arch/x86/kernel/cpu/mtrr/centaur.c
14009index de89f14..316fe3e 100644
14010--- a/arch/x86/kernel/cpu/mtrr/centaur.c
14011+++ b/arch/x86/kernel/cpu/mtrr/centaur.c
14012@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long base, unsigned long size, unsigned int t
14013 return 0;
14014 }
14015
14016-static struct mtrr_ops centaur_mtrr_ops = {
14017+static const struct mtrr_ops centaur_mtrr_ops = {
14018 .vendor = X86_VENDOR_CENTAUR,
14019 .set = centaur_set_mcr,
14020 .get = centaur_get_mcr,
14021diff --git a/arch/x86/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c
14022index 228d982..68a3343 100644
14023--- a/arch/x86/kernel/cpu/mtrr/cyrix.c
14024+++ b/arch/x86/kernel/cpu/mtrr/cyrix.c
14025@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
14026 post_set();
14027 }
14028
14029-static struct mtrr_ops cyrix_mtrr_ops = {
14030+static const struct mtrr_ops cyrix_mtrr_ops = {
14031 .vendor = X86_VENDOR_CYRIX,
14032 .set_all = cyrix_set_all,
14033 .set = cyrix_set_arr,
14034diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
14035index 55da0c5..4d75584 100644
14036--- a/arch/x86/kernel/cpu/mtrr/generic.c
14037+++ b/arch/x86/kernel/cpu/mtrr/generic.c
14038@@ -752,7 +752,7 @@ int positive_have_wrcomb(void)
14039 /*
14040 * Generic structure...
14041 */
14042-struct mtrr_ops generic_mtrr_ops = {
14043+const struct mtrr_ops generic_mtrr_ops = {
14044 .use_intel_if = 1,
14045 .set_all = generic_set_all,
14046 .get = generic_get_mtrr,
14047diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
14048index fd60f09..c94ef52 100644
14049--- a/arch/x86/kernel/cpu/mtrr/main.c
14050+++ b/arch/x86/kernel/cpu/mtrr/main.c
14051@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
14052 u64 size_or_mask, size_and_mask;
14053 static bool mtrr_aps_delayed_init;
14054
14055-static struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
14056+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
14057
14058-struct mtrr_ops *mtrr_if;
14059+const struct mtrr_ops *mtrr_if;
14060
14061 static void set_mtrr(unsigned int reg, unsigned long base,
14062 unsigned long size, mtrr_type type);
14063
14064-void set_mtrr_ops(struct mtrr_ops *ops)
14065+void set_mtrr_ops(const struct mtrr_ops *ops)
14066 {
14067 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
14068 mtrr_ops[ops->vendor] = ops;
14069diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
14070index a501dee..816c719 100644
14071--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
14072+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
14073@@ -25,14 +25,14 @@ struct mtrr_ops {
14074 int (*validate_add_page)(unsigned long base, unsigned long size,
14075 unsigned int type);
14076 int (*have_wrcomb)(void);
14077-};
14078+} __do_const;
14079
14080 extern int generic_get_free_region(unsigned long base, unsigned long size,
14081 int replace_reg);
14082 extern int generic_validate_add_page(unsigned long base, unsigned long size,
14083 unsigned int type);
14084
14085-extern struct mtrr_ops generic_mtrr_ops;
14086+extern const struct mtrr_ops generic_mtrr_ops;
14087
14088 extern int positive_have_wrcomb(void);
14089
14090@@ -53,10 +53,10 @@ void fill_mtrr_var_range(unsigned int index,
14091 u32 base_lo, u32 base_hi, u32 mask_lo, u32 mask_hi);
14092 void get_mtrr_state(void);
14093
14094-extern void set_mtrr_ops(struct mtrr_ops *ops);
14095+extern void set_mtrr_ops(const struct mtrr_ops *ops);
14096
14097 extern u64 size_or_mask, size_and_mask;
14098-extern struct mtrr_ops *mtrr_if;
14099+extern const struct mtrr_ops *mtrr_if;
14100
14101 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
14102 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
14103diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
14104index 0ff02ca..fc49a60 100644
14105--- a/arch/x86/kernel/cpu/perf_event.c
14106+++ b/arch/x86/kernel/cpu/perf_event.c
14107@@ -723,10 +723,10 @@ x86_perf_event_update(struct perf_event *event,
14108 * count to the generic event atomically:
14109 */
14110 again:
14111- prev_raw_count = atomic64_read(&hwc->prev_count);
14112+ prev_raw_count = atomic64_read_unchecked(&hwc->prev_count);
14113 rdmsrl(hwc->event_base + idx, new_raw_count);
14114
14115- if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
14116+ if (atomic64_cmpxchg_unchecked(&hwc->prev_count, prev_raw_count,
14117 new_raw_count) != prev_raw_count)
14118 goto again;
14119
14120@@ -741,7 +741,7 @@ again:
14121 delta = (new_raw_count << shift) - (prev_raw_count << shift);
14122 delta >>= shift;
14123
14124- atomic64_add(delta, &event->count);
14125+ atomic64_add_unchecked(delta, &event->count);
14126 atomic64_sub(delta, &hwc->period_left);
14127
14128 return new_raw_count;
14129@@ -1353,7 +1353,7 @@ x86_perf_event_set_period(struct perf_event *event,
14130 * The hw event starts counting from this event offset,
14131 * mark it to be able to extra future deltas:
14132 */
14133- atomic64_set(&hwc->prev_count, (u64)-left);
14134+ atomic64_set_unchecked(&hwc->prev_count, (u64)-left);
14135
14136 err = checking_wrmsrl(hwc->event_base + idx,
14137 (u64)(-left) & x86_pmu.event_mask);
14138@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
14139 break;
14140
14141 callchain_store(entry, frame.return_address);
14142- fp = frame.next_frame;
14143+ fp = (__force const void __user *)frame.next_frame;
14144 }
14145 }
14146
14147diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
14148index 898df97..9e82503 100644
14149--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
14150+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
14151@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
14152
14153 /* Interface defining a CPU specific perfctr watchdog */
14154 struct wd_ops {
14155- int (*reserve)(void);
14156- void (*unreserve)(void);
14157- int (*setup)(unsigned nmi_hz);
14158- void (*rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
14159- void (*stop)(void);
14160+ int (* const reserve)(void);
14161+ void (* const unreserve)(void);
14162+ int (* const setup)(unsigned nmi_hz);
14163+ void (* const rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
14164+ void (* const stop)(void);
14165 unsigned perfctr;
14166 unsigned evntsel;
14167 u64 checkbit;
14168@@ -645,6 +645,7 @@ static const struct wd_ops p4_wd_ops = {
14169 #define ARCH_PERFMON_NMI_EVENT_SEL ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL
14170 #define ARCH_PERFMON_NMI_EVENT_UMASK ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK
14171
14172+/* cannot be const */
14173 static struct wd_ops intel_arch_wd_ops;
14174
14175 static int setup_intel_arch_watchdog(unsigned nmi_hz)
14176@@ -697,6 +698,7 @@ static int setup_intel_arch_watchdog(unsigned nmi_hz)
14177 return 1;
14178 }
14179
14180+/* cannot be const */
14181 static struct wd_ops intel_arch_wd_ops __read_mostly = {
14182 .reserve = single_msr_reserve,
14183 .unreserve = single_msr_unreserve,
14184diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
14185index ff95824..2ffdcb5 100644
14186--- a/arch/x86/kernel/crash.c
14187+++ b/arch/x86/kernel/crash.c
14188@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, struct die_args *args)
14189 regs = args->regs;
14190
14191 #ifdef CONFIG_X86_32
14192- if (!user_mode_vm(regs)) {
14193+ if (!user_mode(regs)) {
14194 crash_fixup_ss_esp(&fixed_regs, regs);
14195 regs = &fixed_regs;
14196 }
14197diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
14198index 37250fe..bf2ec74 100644
14199--- a/arch/x86/kernel/doublefault_32.c
14200+++ b/arch/x86/kernel/doublefault_32.c
14201@@ -11,7 +11,7 @@
14202
14203 #define DOUBLEFAULT_STACKSIZE (1024)
14204 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
14205-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
14206+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
14207
14208 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
14209
14210@@ -21,7 +21,7 @@ static void doublefault_fn(void)
14211 unsigned long gdt, tss;
14212
14213 store_gdt(&gdt_desc);
14214- gdt = gdt_desc.address;
14215+ gdt = (unsigned long)gdt_desc.address;
14216
14217 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
14218
14219@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
14220 /* 0x2 bit is always set */
14221 .flags = X86_EFLAGS_SF | 0x2,
14222 .sp = STACK_START,
14223- .es = __USER_DS,
14224+ .es = __KERNEL_DS,
14225 .cs = __KERNEL_CS,
14226 .ss = __KERNEL_DS,
14227- .ds = __USER_DS,
14228+ .ds = __KERNEL_DS,
14229 .fs = __KERNEL_PERCPU,
14230
14231 .__cr3 = __pa_nodebug(swapper_pg_dir),
14232diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
14233index 2d8a371..4fa6ae6 100644
14234--- a/arch/x86/kernel/dumpstack.c
14235+++ b/arch/x86/kernel/dumpstack.c
14236@@ -2,6 +2,9 @@
14237 * Copyright (C) 1991, 1992 Linus Torvalds
14238 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
14239 */
14240+#ifdef CONFIG_GRKERNSEC_HIDESYM
14241+#define __INCLUDED_BY_HIDESYM 1
14242+#endif
14243 #include <linux/kallsyms.h>
14244 #include <linux/kprobes.h>
14245 #include <linux/uaccess.h>
14246@@ -28,7 +31,7 @@ static int die_counter;
14247
14248 void printk_address(unsigned long address, int reliable)
14249 {
14250- printk(" [<%p>] %s%pS\n", (void *) address,
14251+ printk(" [<%p>] %s%pA\n", (void *) address,
14252 reliable ? "" : "? ", (void *) address);
14253 }
14254
14255@@ -36,9 +39,8 @@ void printk_address(unsigned long address, int reliable)
14256 static void
14257 print_ftrace_graph_addr(unsigned long addr, void *data,
14258 const struct stacktrace_ops *ops,
14259- struct thread_info *tinfo, int *graph)
14260+ struct task_struct *task, int *graph)
14261 {
14262- struct task_struct *task = tinfo->task;
14263 unsigned long ret_addr;
14264 int index = task->curr_ret_stack;
14265
14266@@ -59,7 +61,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14267 static inline void
14268 print_ftrace_graph_addr(unsigned long addr, void *data,
14269 const struct stacktrace_ops *ops,
14270- struct thread_info *tinfo, int *graph)
14271+ struct task_struct *task, int *graph)
14272 { }
14273 #endif
14274
14275@@ -70,10 +72,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14276 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
14277 */
14278
14279-static inline int valid_stack_ptr(struct thread_info *tinfo,
14280- void *p, unsigned int size, void *end)
14281+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
14282 {
14283- void *t = tinfo;
14284 if (end) {
14285 if (p < end && p >= (end-THREAD_SIZE))
14286 return 1;
14287@@ -84,14 +84,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
14288 }
14289
14290 unsigned long
14291-print_context_stack(struct thread_info *tinfo,
14292+print_context_stack(struct task_struct *task, void *stack_start,
14293 unsigned long *stack, unsigned long bp,
14294 const struct stacktrace_ops *ops, void *data,
14295 unsigned long *end, int *graph)
14296 {
14297 struct stack_frame *frame = (struct stack_frame *)bp;
14298
14299- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
14300+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
14301 unsigned long addr;
14302
14303 addr = *stack;
14304@@ -103,7 +103,7 @@ print_context_stack(struct thread_info *tinfo,
14305 } else {
14306 ops->address(data, addr, 0);
14307 }
14308- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14309+ print_ftrace_graph_addr(addr, data, ops, task, graph);
14310 }
14311 stack++;
14312 }
14313@@ -180,7 +180,7 @@ void dump_stack(void)
14314 #endif
14315
14316 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
14317- current->pid, current->comm, print_tainted(),
14318+ task_pid_nr(current), current->comm, print_tainted(),
14319 init_utsname()->release,
14320 (int)strcspn(init_utsname()->version, " "),
14321 init_utsname()->version);
14322@@ -220,6 +220,8 @@ unsigned __kprobes long oops_begin(void)
14323 return flags;
14324 }
14325
14326+extern void gr_handle_kernel_exploit(void);
14327+
14328 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14329 {
14330 if (regs && kexec_should_crash(current))
14331@@ -241,7 +243,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14332 panic("Fatal exception in interrupt");
14333 if (panic_on_oops)
14334 panic("Fatal exception");
14335- do_exit(signr);
14336+
14337+ gr_handle_kernel_exploit();
14338+
14339+ do_group_exit(signr);
14340 }
14341
14342 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14343@@ -295,7 +300,7 @@ void die(const char *str, struct pt_regs *regs, long err)
14344 unsigned long flags = oops_begin();
14345 int sig = SIGSEGV;
14346
14347- if (!user_mode_vm(regs))
14348+ if (!user_mode(regs))
14349 report_bug(regs->ip, regs);
14350
14351 if (__die(str, regs, err))
14352diff --git a/arch/x86/kernel/dumpstack.h b/arch/x86/kernel/dumpstack.h
14353index 81086c2..13e8b17 100644
14354--- a/arch/x86/kernel/dumpstack.h
14355+++ b/arch/x86/kernel/dumpstack.h
14356@@ -15,7 +15,7 @@
14357 #endif
14358
14359 extern unsigned long
14360-print_context_stack(struct thread_info *tinfo,
14361+print_context_stack(struct task_struct *task, void *stack_start,
14362 unsigned long *stack, unsigned long bp,
14363 const struct stacktrace_ops *ops, void *data,
14364 unsigned long *end, int *graph);
14365diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
14366index f7dd2a7..504f53b 100644
14367--- a/arch/x86/kernel/dumpstack_32.c
14368+++ b/arch/x86/kernel/dumpstack_32.c
14369@@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14370 #endif
14371
14372 for (;;) {
14373- struct thread_info *context;
14374+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14375+ bp = print_context_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14376
14377- context = (struct thread_info *)
14378- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
14379- bp = print_context_stack(context, stack, bp, ops,
14380- data, NULL, &graph);
14381-
14382- stack = (unsigned long *)context->previous_esp;
14383- if (!stack)
14384+ if (stack_start == task_stack_page(task))
14385 break;
14386+ stack = *(unsigned long **)stack_start;
14387 if (ops->stack(data, "IRQ") < 0)
14388 break;
14389 touch_nmi_watchdog();
14390@@ -112,11 +108,12 @@ void show_registers(struct pt_regs *regs)
14391 * When in-kernel, we also print out the stack and code at the
14392 * time of the fault..
14393 */
14394- if (!user_mode_vm(regs)) {
14395+ if (!user_mode(regs)) {
14396 unsigned int code_prologue = code_bytes * 43 / 64;
14397 unsigned int code_len = code_bytes;
14398 unsigned char c;
14399 u8 *ip;
14400+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
14401
14402 printk(KERN_EMERG "Stack:\n");
14403 show_stack_log_lvl(NULL, regs, &regs->sp,
14404@@ -124,10 +121,10 @@ void show_registers(struct pt_regs *regs)
14405
14406 printk(KERN_EMERG "Code: ");
14407
14408- ip = (u8 *)regs->ip - code_prologue;
14409+ ip = (u8 *)regs->ip - code_prologue + cs_base;
14410 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
14411 /* try starting at IP */
14412- ip = (u8 *)regs->ip;
14413+ ip = (u8 *)regs->ip + cs_base;
14414 code_len = code_len - code_prologue + 1;
14415 }
14416 for (i = 0; i < code_len; i++, ip++) {
14417@@ -136,7 +133,7 @@ void show_registers(struct pt_regs *regs)
14418 printk(" Bad EIP value.");
14419 break;
14420 }
14421- if (ip == (u8 *)regs->ip)
14422+ if (ip == (u8 *)regs->ip + cs_base)
14423 printk("<%02x> ", c);
14424 else
14425 printk("%02x ", c);
14426@@ -145,10 +142,23 @@ void show_registers(struct pt_regs *regs)
14427 printk("\n");
14428 }
14429
14430+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14431+void pax_check_alloca(unsigned long size)
14432+{
14433+ unsigned long sp = (unsigned long)&sp, stack_left;
14434+
14435+ /* all kernel stacks are of the same size */
14436+ stack_left = sp & (THREAD_SIZE - 1);
14437+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14438+}
14439+EXPORT_SYMBOL(pax_check_alloca);
14440+#endif
14441+
14442 int is_valid_bugaddr(unsigned long ip)
14443 {
14444 unsigned short ud2;
14445
14446+ ip = ktla_ktva(ip);
14447 if (ip < PAGE_OFFSET)
14448 return 0;
14449 if (probe_kernel_address((unsigned short *)ip, ud2))
14450diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
14451index a071e6b..36cd585 100644
14452--- a/arch/x86/kernel/dumpstack_64.c
14453+++ b/arch/x86/kernel/dumpstack_64.c
14454@@ -116,8 +116,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14455 unsigned long *irq_stack_end =
14456 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
14457 unsigned used = 0;
14458- struct thread_info *tinfo;
14459 int graph = 0;
14460+ void *stack_start;
14461
14462 if (!task)
14463 task = current;
14464@@ -146,10 +146,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14465 * current stack address. If the stacks consist of nested
14466 * exceptions
14467 */
14468- tinfo = task_thread_info(task);
14469 for (;;) {
14470 char *id;
14471 unsigned long *estack_end;
14472+
14473 estack_end = in_exception_stack(cpu, (unsigned long)stack,
14474 &used, &id);
14475
14476@@ -157,7 +157,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14477 if (ops->stack(data, id) < 0)
14478 break;
14479
14480- bp = print_context_stack(tinfo, stack, bp, ops,
14481+ bp = print_context_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
14482 data, estack_end, &graph);
14483 ops->stack(data, "<EOE>");
14484 /*
14485@@ -176,7 +176,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14486 if (stack >= irq_stack && stack < irq_stack_end) {
14487 if (ops->stack(data, "IRQ") < 0)
14488 break;
14489- bp = print_context_stack(tinfo, stack, bp,
14490+ bp = print_context_stack(task, irq_stack, stack, bp,
14491 ops, data, irq_stack_end, &graph);
14492 /*
14493 * We link to the next stack (which would be
14494@@ -195,7 +195,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14495 /*
14496 * This handles the process stack:
14497 */
14498- bp = print_context_stack(tinfo, stack, bp, ops, data, NULL, &graph);
14499+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14500+ bp = print_context_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14501 put_cpu();
14502 }
14503 EXPORT_SYMBOL(dump_trace);
14504@@ -304,3 +305,50 @@ int is_valid_bugaddr(unsigned long ip)
14505 return ud2 == 0x0b0f;
14506 }
14507
14508+
14509+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14510+void pax_check_alloca(unsigned long size)
14511+{
14512+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
14513+ unsigned cpu, used;
14514+ char *id;
14515+
14516+ /* check the process stack first */
14517+ stack_start = (unsigned long)task_stack_page(current);
14518+ stack_end = stack_start + THREAD_SIZE;
14519+ if (likely(stack_start <= sp && sp < stack_end)) {
14520+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
14521+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14522+ return;
14523+ }
14524+
14525+ cpu = get_cpu();
14526+
14527+ /* check the irq stacks */
14528+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
14529+ stack_start = stack_end - IRQ_STACK_SIZE;
14530+ if (stack_start <= sp && sp < stack_end) {
14531+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
14532+ put_cpu();
14533+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14534+ return;
14535+ }
14536+
14537+ /* check the exception stacks */
14538+ used = 0;
14539+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
14540+ stack_start = stack_end - EXCEPTION_STKSZ;
14541+ if (stack_end && stack_start <= sp && sp < stack_end) {
14542+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
14543+ put_cpu();
14544+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14545+ return;
14546+ }
14547+
14548+ put_cpu();
14549+
14550+ /* unknown stack */
14551+ BUG();
14552+}
14553+EXPORT_SYMBOL(pax_check_alloca);
14554+#endif
14555diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
14556index a89739a..95e0c48 100644
14557--- a/arch/x86/kernel/e820.c
14558+++ b/arch/x86/kernel/e820.c
14559@@ -733,7 +733,7 @@ struct early_res {
14560 };
14561 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
14562 { 0, PAGE_SIZE, "BIOS data page" }, /* BIOS data page */
14563- {}
14564+ { 0, 0, {0}, 0 }
14565 };
14566
14567 static int __init find_overlapped_early(u64 start, u64 end)
14568diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
14569index b9c830c..1e41a96 100644
14570--- a/arch/x86/kernel/early_printk.c
14571+++ b/arch/x86/kernel/early_printk.c
14572@@ -7,6 +7,7 @@
14573 #include <linux/pci_regs.h>
14574 #include <linux/pci_ids.h>
14575 #include <linux/errno.h>
14576+#include <linux/sched.h>
14577 #include <asm/io.h>
14578 #include <asm/processor.h>
14579 #include <asm/fcntl.h>
14580@@ -170,6 +171,8 @@ asmlinkage void early_printk(const char *fmt, ...)
14581 int n;
14582 va_list ap;
14583
14584+ pax_track_stack();
14585+
14586 va_start(ap, fmt);
14587 n = vscnprintf(buf, sizeof(buf), fmt, ap);
14588 early_console->write(early_console, buf, n);
14589diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c
14590index 5cab48e..b025f9b 100644
14591--- a/arch/x86/kernel/efi_32.c
14592+++ b/arch/x86/kernel/efi_32.c
14593@@ -38,70 +38,56 @@
14594 */
14595
14596 static unsigned long efi_rt_eflags;
14597-static pgd_t efi_bak_pg_dir_pointer[2];
14598+static pgd_t __initdata efi_bak_pg_dir_pointer[KERNEL_PGD_PTRS];
14599
14600-void efi_call_phys_prelog(void)
14601+void __init efi_call_phys_prelog(void)
14602 {
14603- unsigned long cr4;
14604- unsigned long temp;
14605 struct desc_ptr gdt_descr;
14606
14607+#ifdef CONFIG_PAX_KERNEXEC
14608+ struct desc_struct d;
14609+#endif
14610+
14611 local_irq_save(efi_rt_eflags);
14612
14613- /*
14614- * If I don't have PAE, I should just duplicate two entries in page
14615- * directory. If I have PAE, I just need to duplicate one entry in
14616- * page directory.
14617- */
14618- cr4 = read_cr4_safe();
14619-
14620- if (cr4 & X86_CR4_PAE) {
14621- efi_bak_pg_dir_pointer[0].pgd =
14622- swapper_pg_dir[pgd_index(0)].pgd;
14623- swapper_pg_dir[0].pgd =
14624- swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
14625- } else {
14626- efi_bak_pg_dir_pointer[0].pgd =
14627- swapper_pg_dir[pgd_index(0)].pgd;
14628- efi_bak_pg_dir_pointer[1].pgd =
14629- swapper_pg_dir[pgd_index(0x400000)].pgd;
14630- swapper_pg_dir[pgd_index(0)].pgd =
14631- swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
14632- temp = PAGE_OFFSET + 0x400000;
14633- swapper_pg_dir[pgd_index(0x400000)].pgd =
14634- swapper_pg_dir[pgd_index(temp)].pgd;
14635- }
14636+ clone_pgd_range(efi_bak_pg_dir_pointer, swapper_pg_dir, KERNEL_PGD_PTRS);
14637+ clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
14638+ min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
14639
14640 /*
14641 * After the lock is released, the original page table is restored.
14642 */
14643 __flush_tlb_all();
14644
14645+#ifdef CONFIG_PAX_KERNEXEC
14646+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
14647+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
14648+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
14649+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
14650+#endif
14651+
14652 gdt_descr.address = __pa(get_cpu_gdt_table(0));
14653 gdt_descr.size = GDT_SIZE - 1;
14654 load_gdt(&gdt_descr);
14655 }
14656
14657-void efi_call_phys_epilog(void)
14658+void __init efi_call_phys_epilog(void)
14659 {
14660- unsigned long cr4;
14661 struct desc_ptr gdt_descr;
14662
14663+#ifdef CONFIG_PAX_KERNEXEC
14664+ struct desc_struct d;
14665+
14666+ memset(&d, 0, sizeof d);
14667+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
14668+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
14669+#endif
14670+
14671 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
14672 gdt_descr.size = GDT_SIZE - 1;
14673 load_gdt(&gdt_descr);
14674
14675- cr4 = read_cr4_safe();
14676-
14677- if (cr4 & X86_CR4_PAE) {
14678- swapper_pg_dir[pgd_index(0)].pgd =
14679- efi_bak_pg_dir_pointer[0].pgd;
14680- } else {
14681- swapper_pg_dir[pgd_index(0)].pgd =
14682- efi_bak_pg_dir_pointer[0].pgd;
14683- swapper_pg_dir[pgd_index(0x400000)].pgd =
14684- efi_bak_pg_dir_pointer[1].pgd;
14685- }
14686+ clone_pgd_range(swapper_pg_dir, efi_bak_pg_dir_pointer, KERNEL_PGD_PTRS);
14687
14688 /*
14689 * After the lock is released, the original page table is restored.
14690diff --git a/arch/x86/kernel/efi_stub_32.S b/arch/x86/kernel/efi_stub_32.S
14691index fbe66e6..c5c0dd2 100644
14692--- a/arch/x86/kernel/efi_stub_32.S
14693+++ b/arch/x86/kernel/efi_stub_32.S
14694@@ -6,7 +6,9 @@
14695 */
14696
14697 #include <linux/linkage.h>
14698+#include <linux/init.h>
14699 #include <asm/page_types.h>
14700+#include <asm/segment.h>
14701
14702 /*
14703 * efi_call_phys(void *, ...) is a function with variable parameters.
14704@@ -20,7 +22,7 @@
14705 * service functions will comply with gcc calling convention, too.
14706 */
14707
14708-.text
14709+__INIT
14710 ENTRY(efi_call_phys)
14711 /*
14712 * 0. The function can only be called in Linux kernel. So CS has been
14713@@ -36,9 +38,11 @@ ENTRY(efi_call_phys)
14714 * The mapping of lower virtual memory has been created in prelog and
14715 * epilog.
14716 */
14717- movl $1f, %edx
14718- subl $__PAGE_OFFSET, %edx
14719- jmp *%edx
14720+ movl $(__KERNEXEC_EFI_DS), %edx
14721+ mov %edx, %ds
14722+ mov %edx, %es
14723+ mov %edx, %ss
14724+ ljmp $(__KERNEXEC_EFI_CS),$1f-__PAGE_OFFSET
14725 1:
14726
14727 /*
14728@@ -47,14 +51,8 @@ ENTRY(efi_call_phys)
14729 * parameter 2, ..., param n. To make things easy, we save the return
14730 * address of efi_call_phys in a global variable.
14731 */
14732- popl %edx
14733- movl %edx, saved_return_addr
14734- /* get the function pointer into ECX*/
14735- popl %ecx
14736- movl %ecx, efi_rt_function_ptr
14737- movl $2f, %edx
14738- subl $__PAGE_OFFSET, %edx
14739- pushl %edx
14740+ popl (saved_return_addr)
14741+ popl (efi_rt_function_ptr)
14742
14743 /*
14744 * 3. Clear PG bit in %CR0.
14745@@ -73,9 +71,8 @@ ENTRY(efi_call_phys)
14746 /*
14747 * 5. Call the physical function.
14748 */
14749- jmp *%ecx
14750+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
14751
14752-2:
14753 /*
14754 * 6. After EFI runtime service returns, control will return to
14755 * following instruction. We'd better readjust stack pointer first.
14756@@ -88,35 +85,32 @@ ENTRY(efi_call_phys)
14757 movl %cr0, %edx
14758 orl $0x80000000, %edx
14759 movl %edx, %cr0
14760- jmp 1f
14761-1:
14762+
14763 /*
14764 * 8. Now restore the virtual mode from flat mode by
14765 * adding EIP with PAGE_OFFSET.
14766 */
14767- movl $1f, %edx
14768- jmp *%edx
14769+ ljmp $(__KERNEL_CS),$1f+__PAGE_OFFSET
14770 1:
14771+ movl $(__KERNEL_DS), %edx
14772+ mov %edx, %ds
14773+ mov %edx, %es
14774+ mov %edx, %ss
14775
14776 /*
14777 * 9. Balance the stack. And because EAX contain the return value,
14778 * we'd better not clobber it.
14779 */
14780- leal efi_rt_function_ptr, %edx
14781- movl (%edx), %ecx
14782- pushl %ecx
14783+ pushl (efi_rt_function_ptr)
14784
14785 /*
14786- * 10. Push the saved return address onto the stack and return.
14787+ * 10. Return to the saved return address.
14788 */
14789- leal saved_return_addr, %edx
14790- movl (%edx), %ecx
14791- pushl %ecx
14792- ret
14793+ jmpl *(saved_return_addr)
14794 ENDPROC(efi_call_phys)
14795 .previous
14796
14797-.data
14798+__INITDATA
14799 saved_return_addr:
14800 .long 0
14801 efi_rt_function_ptr:
14802diff --git a/arch/x86/kernel/efi_stub_64.S b/arch/x86/kernel/efi_stub_64.S
14803index 4c07cca..2c8427d 100644
14804--- a/arch/x86/kernel/efi_stub_64.S
14805+++ b/arch/x86/kernel/efi_stub_64.S
14806@@ -7,6 +7,7 @@
14807 */
14808
14809 #include <linux/linkage.h>
14810+#include <asm/alternative-asm.h>
14811
14812 #define SAVE_XMM \
14813 mov %rsp, %rax; \
14814@@ -40,6 +41,7 @@ ENTRY(efi_call0)
14815 call *%rdi
14816 addq $32, %rsp
14817 RESTORE_XMM
14818+ pax_force_retaddr 0, 1
14819 ret
14820 ENDPROC(efi_call0)
14821
14822@@ -50,6 +52,7 @@ ENTRY(efi_call1)
14823 call *%rdi
14824 addq $32, %rsp
14825 RESTORE_XMM
14826+ pax_force_retaddr 0, 1
14827 ret
14828 ENDPROC(efi_call1)
14829
14830@@ -60,6 +63,7 @@ ENTRY(efi_call2)
14831 call *%rdi
14832 addq $32, %rsp
14833 RESTORE_XMM
14834+ pax_force_retaddr 0, 1
14835 ret
14836 ENDPROC(efi_call2)
14837
14838@@ -71,6 +75,7 @@ ENTRY(efi_call3)
14839 call *%rdi
14840 addq $32, %rsp
14841 RESTORE_XMM
14842+ pax_force_retaddr 0, 1
14843 ret
14844 ENDPROC(efi_call3)
14845
14846@@ -83,6 +88,7 @@ ENTRY(efi_call4)
14847 call *%rdi
14848 addq $32, %rsp
14849 RESTORE_XMM
14850+ pax_force_retaddr 0, 1
14851 ret
14852 ENDPROC(efi_call4)
14853
14854@@ -96,6 +102,7 @@ ENTRY(efi_call5)
14855 call *%rdi
14856 addq $48, %rsp
14857 RESTORE_XMM
14858+ pax_force_retaddr 0, 1
14859 ret
14860 ENDPROC(efi_call5)
14861
14862@@ -112,5 +119,6 @@ ENTRY(efi_call6)
14863 call *%rdi
14864 addq $48, %rsp
14865 RESTORE_XMM
14866+ pax_force_retaddr 0, 1
14867 ret
14868 ENDPROC(efi_call6)
14869diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
14870index c097e7d..c689cf4 100644
14871--- a/arch/x86/kernel/entry_32.S
14872+++ b/arch/x86/kernel/entry_32.S
14873@@ -185,13 +185,146 @@
14874 /*CFI_REL_OFFSET gs, PT_GS*/
14875 .endm
14876 .macro SET_KERNEL_GS reg
14877+
14878+#ifdef CONFIG_CC_STACKPROTECTOR
14879 movl $(__KERNEL_STACK_CANARY), \reg
14880+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
14881+ movl $(__USER_DS), \reg
14882+#else
14883+ xorl \reg, \reg
14884+#endif
14885+
14886 movl \reg, %gs
14887 .endm
14888
14889 #endif /* CONFIG_X86_32_LAZY_GS */
14890
14891-.macro SAVE_ALL
14892+.macro pax_enter_kernel
14893+#ifdef CONFIG_PAX_KERNEXEC
14894+ call pax_enter_kernel
14895+#endif
14896+.endm
14897+
14898+.macro pax_exit_kernel
14899+#ifdef CONFIG_PAX_KERNEXEC
14900+ call pax_exit_kernel
14901+#endif
14902+.endm
14903+
14904+#ifdef CONFIG_PAX_KERNEXEC
14905+ENTRY(pax_enter_kernel)
14906+#ifdef CONFIG_PARAVIRT
14907+ pushl %eax
14908+ pushl %ecx
14909+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
14910+ mov %eax, %esi
14911+#else
14912+ mov %cr0, %esi
14913+#endif
14914+ bts $16, %esi
14915+ jnc 1f
14916+ mov %cs, %esi
14917+ cmp $__KERNEL_CS, %esi
14918+ jz 3f
14919+ ljmp $__KERNEL_CS, $3f
14920+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
14921+2:
14922+#ifdef CONFIG_PARAVIRT
14923+ mov %esi, %eax
14924+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
14925+#else
14926+ mov %esi, %cr0
14927+#endif
14928+3:
14929+#ifdef CONFIG_PARAVIRT
14930+ popl %ecx
14931+ popl %eax
14932+#endif
14933+ ret
14934+ENDPROC(pax_enter_kernel)
14935+
14936+ENTRY(pax_exit_kernel)
14937+#ifdef CONFIG_PARAVIRT
14938+ pushl %eax
14939+ pushl %ecx
14940+#endif
14941+ mov %cs, %esi
14942+ cmp $__KERNEXEC_KERNEL_CS, %esi
14943+ jnz 2f
14944+#ifdef CONFIG_PARAVIRT
14945+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
14946+ mov %eax, %esi
14947+#else
14948+ mov %cr0, %esi
14949+#endif
14950+ btr $16, %esi
14951+ ljmp $__KERNEL_CS, $1f
14952+1:
14953+#ifdef CONFIG_PARAVIRT
14954+ mov %esi, %eax
14955+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
14956+#else
14957+ mov %esi, %cr0
14958+#endif
14959+2:
14960+#ifdef CONFIG_PARAVIRT
14961+ popl %ecx
14962+ popl %eax
14963+#endif
14964+ ret
14965+ENDPROC(pax_exit_kernel)
14966+#endif
14967+
14968+.macro pax_erase_kstack
14969+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14970+ call pax_erase_kstack
14971+#endif
14972+.endm
14973+
14974+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14975+/*
14976+ * ebp: thread_info
14977+ * ecx, edx: can be clobbered
14978+ */
14979+ENTRY(pax_erase_kstack)
14980+ pushl %edi
14981+ pushl %eax
14982+
14983+ mov TI_lowest_stack(%ebp), %edi
14984+ mov $-0xBEEF, %eax
14985+ std
14986+
14987+1: mov %edi, %ecx
14988+ and $THREAD_SIZE_asm - 1, %ecx
14989+ shr $2, %ecx
14990+ repne scasl
14991+ jecxz 2f
14992+
14993+ cmp $2*16, %ecx
14994+ jc 2f
14995+
14996+ mov $2*16, %ecx
14997+ repe scasl
14998+ jecxz 2f
14999+ jne 1b
15000+
15001+2: cld
15002+ mov %esp, %ecx
15003+ sub %edi, %ecx
15004+ shr $2, %ecx
15005+ rep stosl
15006+
15007+ mov TI_task_thread_sp0(%ebp), %edi
15008+ sub $128, %edi
15009+ mov %edi, TI_lowest_stack(%ebp)
15010+
15011+ popl %eax
15012+ popl %edi
15013+ ret
15014+ENDPROC(pax_erase_kstack)
15015+#endif
15016+
15017+.macro __SAVE_ALL _DS
15018 cld
15019 PUSH_GS
15020 pushl %fs
15021@@ -224,7 +357,7 @@
15022 pushl %ebx
15023 CFI_ADJUST_CFA_OFFSET 4
15024 CFI_REL_OFFSET ebx, 0
15025- movl $(__USER_DS), %edx
15026+ movl $\_DS, %edx
15027 movl %edx, %ds
15028 movl %edx, %es
15029 movl $(__KERNEL_PERCPU), %edx
15030@@ -232,6 +365,15 @@
15031 SET_KERNEL_GS %edx
15032 .endm
15033
15034+.macro SAVE_ALL
15035+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
15036+ __SAVE_ALL __KERNEL_DS
15037+ pax_enter_kernel
15038+#else
15039+ __SAVE_ALL __USER_DS
15040+#endif
15041+.endm
15042+
15043 .macro RESTORE_INT_REGS
15044 popl %ebx
15045 CFI_ADJUST_CFA_OFFSET -4
15046@@ -331,7 +473,7 @@ ENTRY(ret_from_fork)
15047 CFI_ADJUST_CFA_OFFSET -4
15048 jmp syscall_exit
15049 CFI_ENDPROC
15050-END(ret_from_fork)
15051+ENDPROC(ret_from_fork)
15052
15053 /*
15054 * Return to user mode is not as complex as all this looks,
15055@@ -352,7 +494,15 @@ check_userspace:
15056 movb PT_CS(%esp), %al
15057 andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
15058 cmpl $USER_RPL, %eax
15059+
15060+#ifdef CONFIG_PAX_KERNEXEC
15061+ jae resume_userspace
15062+
15063+ PAX_EXIT_KERNEL
15064+ jmp resume_kernel
15065+#else
15066 jb resume_kernel # not returning to v8086 or userspace
15067+#endif
15068
15069 ENTRY(resume_userspace)
15070 LOCKDEP_SYS_EXIT
15071@@ -364,8 +514,8 @@ ENTRY(resume_userspace)
15072 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
15073 # int/exception return?
15074 jne work_pending
15075- jmp restore_all
15076-END(ret_from_exception)
15077+ jmp restore_all_pax
15078+ENDPROC(ret_from_exception)
15079
15080 #ifdef CONFIG_PREEMPT
15081 ENTRY(resume_kernel)
15082@@ -380,7 +530,7 @@ need_resched:
15083 jz restore_all
15084 call preempt_schedule_irq
15085 jmp need_resched
15086-END(resume_kernel)
15087+ENDPROC(resume_kernel)
15088 #endif
15089 CFI_ENDPROC
15090
15091@@ -414,25 +564,36 @@ sysenter_past_esp:
15092 /*CFI_REL_OFFSET cs, 0*/
15093 /*
15094 * Push current_thread_info()->sysenter_return to the stack.
15095- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
15096- * pushed above; +8 corresponds to copy_thread's esp0 setting.
15097 */
15098- pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)
15099+ pushl $0
15100 CFI_ADJUST_CFA_OFFSET 4
15101 CFI_REL_OFFSET eip, 0
15102
15103 pushl %eax
15104 CFI_ADJUST_CFA_OFFSET 4
15105 SAVE_ALL
15106+ GET_THREAD_INFO(%ebp)
15107+ movl TI_sysenter_return(%ebp),%ebp
15108+ movl %ebp,PT_EIP(%esp)
15109 ENABLE_INTERRUPTS(CLBR_NONE)
15110
15111 /*
15112 * Load the potential sixth argument from user stack.
15113 * Careful about security.
15114 */
15115+ movl PT_OLDESP(%esp),%ebp
15116+
15117+#ifdef CONFIG_PAX_MEMORY_UDEREF
15118+ mov PT_OLDSS(%esp),%ds
15119+1: movl %ds:(%ebp),%ebp
15120+ push %ss
15121+ pop %ds
15122+#else
15123 cmpl $__PAGE_OFFSET-3,%ebp
15124 jae syscall_fault
15125 1: movl (%ebp),%ebp
15126+#endif
15127+
15128 movl %ebp,PT_EBP(%esp)
15129 .section __ex_table,"a"
15130 .align 4
15131@@ -455,12 +616,24 @@ sysenter_do_call:
15132 testl $_TIF_ALLWORK_MASK, %ecx
15133 jne sysexit_audit
15134 sysenter_exit:
15135+
15136+#ifdef CONFIG_PAX_RANDKSTACK
15137+ pushl_cfi %eax
15138+ movl %esp, %eax
15139+ call pax_randomize_kstack
15140+ popl_cfi %eax
15141+#endif
15142+
15143+ pax_erase_kstack
15144+
15145 /* if something modifies registers it must also disable sysexit */
15146 movl PT_EIP(%esp), %edx
15147 movl PT_OLDESP(%esp), %ecx
15148 xorl %ebp,%ebp
15149 TRACE_IRQS_ON
15150 1: mov PT_FS(%esp), %fs
15151+2: mov PT_DS(%esp), %ds
15152+3: mov PT_ES(%esp), %es
15153 PTGS_TO_GS
15154 ENABLE_INTERRUPTS_SYSEXIT
15155
15156@@ -477,6 +650,9 @@ sysenter_audit:
15157 movl %eax,%edx /* 2nd arg: syscall number */
15158 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
15159 call audit_syscall_entry
15160+
15161+ pax_erase_kstack
15162+
15163 pushl %ebx
15164 CFI_ADJUST_CFA_OFFSET 4
15165 movl PT_EAX(%esp),%eax /* reload syscall number */
15166@@ -504,11 +680,17 @@ sysexit_audit:
15167
15168 CFI_ENDPROC
15169 .pushsection .fixup,"ax"
15170-2: movl $0,PT_FS(%esp)
15171+4: movl $0,PT_FS(%esp)
15172+ jmp 1b
15173+5: movl $0,PT_DS(%esp)
15174+ jmp 1b
15175+6: movl $0,PT_ES(%esp)
15176 jmp 1b
15177 .section __ex_table,"a"
15178 .align 4
15179- .long 1b,2b
15180+ .long 1b,4b
15181+ .long 2b,5b
15182+ .long 3b,6b
15183 .popsection
15184 PTGS_TO_GS_EX
15185 ENDPROC(ia32_sysenter_target)
15186@@ -538,6 +720,15 @@ syscall_exit:
15187 testl $_TIF_ALLWORK_MASK, %ecx # current->work
15188 jne syscall_exit_work
15189
15190+restore_all_pax:
15191+
15192+#ifdef CONFIG_PAX_RANDKSTACK
15193+ movl %esp, %eax
15194+ call pax_randomize_kstack
15195+#endif
15196+
15197+ pax_erase_kstack
15198+
15199 restore_all:
15200 TRACE_IRQS_IRET
15201 restore_all_notrace:
15202@@ -602,10 +793,29 @@ ldt_ss:
15203 mov PT_OLDESP(%esp), %eax /* load userspace esp */
15204 mov %dx, %ax /* eax: new kernel esp */
15205 sub %eax, %edx /* offset (low word is 0) */
15206- PER_CPU(gdt_page, %ebx)
15207+#ifdef CONFIG_SMP
15208+ movl PER_CPU_VAR(cpu_number), %ebx
15209+ shll $PAGE_SHIFT_asm, %ebx
15210+ addl $cpu_gdt_table, %ebx
15211+#else
15212+ movl $cpu_gdt_table, %ebx
15213+#endif
15214 shr $16, %edx
15215+
15216+#ifdef CONFIG_PAX_KERNEXEC
15217+ mov %cr0, %esi
15218+ btr $16, %esi
15219+ mov %esi, %cr0
15220+#endif
15221+
15222 mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */
15223 mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */
15224+
15225+#ifdef CONFIG_PAX_KERNEXEC
15226+ bts $16, %esi
15227+ mov %esi, %cr0
15228+#endif
15229+
15230 pushl $__ESPFIX_SS
15231 CFI_ADJUST_CFA_OFFSET 4
15232 push %eax /* new kernel esp */
15233@@ -636,36 +846,30 @@ work_resched:
15234 movl TI_flags(%ebp), %ecx
15235 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
15236 # than syscall tracing?
15237- jz restore_all
15238+ jz restore_all_pax
15239 testb $_TIF_NEED_RESCHED, %cl
15240 jnz work_resched
15241
15242 work_notifysig: # deal with pending signals and
15243 # notify-resume requests
15244+ movl %esp, %eax
15245 #ifdef CONFIG_VM86
15246 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
15247- movl %esp, %eax
15248- jne work_notifysig_v86 # returning to kernel-space or
15249+ jz 1f # returning to kernel-space or
15250 # vm86-space
15251- xorl %edx, %edx
15252- call do_notify_resume
15253- jmp resume_userspace_sig
15254
15255- ALIGN
15256-work_notifysig_v86:
15257 pushl %ecx # save ti_flags for do_notify_resume
15258 CFI_ADJUST_CFA_OFFSET 4
15259 call save_v86_state # %eax contains pt_regs pointer
15260 popl %ecx
15261 CFI_ADJUST_CFA_OFFSET -4
15262 movl %eax, %esp
15263-#else
15264- movl %esp, %eax
15265+1:
15266 #endif
15267 xorl %edx, %edx
15268 call do_notify_resume
15269 jmp resume_userspace_sig
15270-END(work_pending)
15271+ENDPROC(work_pending)
15272
15273 # perform syscall exit tracing
15274 ALIGN
15275@@ -673,11 +877,14 @@ syscall_trace_entry:
15276 movl $-ENOSYS,PT_EAX(%esp)
15277 movl %esp, %eax
15278 call syscall_trace_enter
15279+
15280+ pax_erase_kstack
15281+
15282 /* What it returned is what we'll actually use. */
15283 cmpl $(nr_syscalls), %eax
15284 jnae syscall_call
15285 jmp syscall_exit
15286-END(syscall_trace_entry)
15287+ENDPROC(syscall_trace_entry)
15288
15289 # perform syscall exit tracing
15290 ALIGN
15291@@ -690,20 +897,24 @@ syscall_exit_work:
15292 movl %esp, %eax
15293 call syscall_trace_leave
15294 jmp resume_userspace
15295-END(syscall_exit_work)
15296+ENDPROC(syscall_exit_work)
15297 CFI_ENDPROC
15298
15299 RING0_INT_FRAME # can't unwind into user space anyway
15300 syscall_fault:
15301+#ifdef CONFIG_PAX_MEMORY_UDEREF
15302+ push %ss
15303+ pop %ds
15304+#endif
15305 GET_THREAD_INFO(%ebp)
15306 movl $-EFAULT,PT_EAX(%esp)
15307 jmp resume_userspace
15308-END(syscall_fault)
15309+ENDPROC(syscall_fault)
15310
15311 syscall_badsys:
15312 movl $-ENOSYS,PT_EAX(%esp)
15313 jmp resume_userspace
15314-END(syscall_badsys)
15315+ENDPROC(syscall_badsys)
15316 CFI_ENDPROC
15317
15318 /*
15319@@ -726,6 +937,33 @@ PTREGSCALL(rt_sigreturn)
15320 PTREGSCALL(vm86)
15321 PTREGSCALL(vm86old)
15322
15323+ ALIGN;
15324+ENTRY(kernel_execve)
15325+ push %ebp
15326+ sub $PT_OLDSS+4,%esp
15327+ push %edi
15328+ push %ecx
15329+ push %eax
15330+ lea 3*4(%esp),%edi
15331+ mov $PT_OLDSS/4+1,%ecx
15332+ xorl %eax,%eax
15333+ rep stosl
15334+ pop %eax
15335+ pop %ecx
15336+ pop %edi
15337+ movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
15338+ mov %eax,PT_EBX(%esp)
15339+ mov %edx,PT_ECX(%esp)
15340+ mov %ecx,PT_EDX(%esp)
15341+ mov %esp,%eax
15342+ call sys_execve
15343+ GET_THREAD_INFO(%ebp)
15344+ test %eax,%eax
15345+ jz syscall_exit
15346+ add $PT_OLDSS+4,%esp
15347+ pop %ebp
15348+ ret
15349+
15350 .macro FIXUP_ESPFIX_STACK
15351 /*
15352 * Switch back for ESPFIX stack to the normal zerobased stack
15353@@ -735,7 +973,13 @@ PTREGSCALL(vm86old)
15354 * normal stack and adjusts ESP with the matching offset.
15355 */
15356 /* fixup the stack */
15357- PER_CPU(gdt_page, %ebx)
15358+#ifdef CONFIG_SMP
15359+ movl PER_CPU_VAR(cpu_number), %ebx
15360+ shll $PAGE_SHIFT_asm, %ebx
15361+ addl $cpu_gdt_table, %ebx
15362+#else
15363+ movl $cpu_gdt_table, %ebx
15364+#endif
15365 mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */
15366 mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */
15367 shl $16, %eax
15368@@ -793,7 +1037,7 @@ vector=vector+1
15369 .endr
15370 2: jmp common_interrupt
15371 .endr
15372-END(irq_entries_start)
15373+ENDPROC(irq_entries_start)
15374
15375 .previous
15376 END(interrupt)
15377@@ -840,7 +1084,7 @@ ENTRY(coprocessor_error)
15378 CFI_ADJUST_CFA_OFFSET 4
15379 jmp error_code
15380 CFI_ENDPROC
15381-END(coprocessor_error)
15382+ENDPROC(coprocessor_error)
15383
15384 ENTRY(simd_coprocessor_error)
15385 RING0_INT_FRAME
15386@@ -850,7 +1094,7 @@ ENTRY(simd_coprocessor_error)
15387 CFI_ADJUST_CFA_OFFSET 4
15388 jmp error_code
15389 CFI_ENDPROC
15390-END(simd_coprocessor_error)
15391+ENDPROC(simd_coprocessor_error)
15392
15393 ENTRY(device_not_available)
15394 RING0_INT_FRAME
15395@@ -860,7 +1104,7 @@ ENTRY(device_not_available)
15396 CFI_ADJUST_CFA_OFFSET 4
15397 jmp error_code
15398 CFI_ENDPROC
15399-END(device_not_available)
15400+ENDPROC(device_not_available)
15401
15402 #ifdef CONFIG_PARAVIRT
15403 ENTRY(native_iret)
15404@@ -869,12 +1113,12 @@ ENTRY(native_iret)
15405 .align 4
15406 .long native_iret, iret_exc
15407 .previous
15408-END(native_iret)
15409+ENDPROC(native_iret)
15410
15411 ENTRY(native_irq_enable_sysexit)
15412 sti
15413 sysexit
15414-END(native_irq_enable_sysexit)
15415+ENDPROC(native_irq_enable_sysexit)
15416 #endif
15417
15418 ENTRY(overflow)
15419@@ -885,7 +1129,7 @@ ENTRY(overflow)
15420 CFI_ADJUST_CFA_OFFSET 4
15421 jmp error_code
15422 CFI_ENDPROC
15423-END(overflow)
15424+ENDPROC(overflow)
15425
15426 ENTRY(bounds)
15427 RING0_INT_FRAME
15428@@ -895,7 +1139,7 @@ ENTRY(bounds)
15429 CFI_ADJUST_CFA_OFFSET 4
15430 jmp error_code
15431 CFI_ENDPROC
15432-END(bounds)
15433+ENDPROC(bounds)
15434
15435 ENTRY(invalid_op)
15436 RING0_INT_FRAME
15437@@ -905,7 +1149,7 @@ ENTRY(invalid_op)
15438 CFI_ADJUST_CFA_OFFSET 4
15439 jmp error_code
15440 CFI_ENDPROC
15441-END(invalid_op)
15442+ENDPROC(invalid_op)
15443
15444 ENTRY(coprocessor_segment_overrun)
15445 RING0_INT_FRAME
15446@@ -915,7 +1159,7 @@ ENTRY(coprocessor_segment_overrun)
15447 CFI_ADJUST_CFA_OFFSET 4
15448 jmp error_code
15449 CFI_ENDPROC
15450-END(coprocessor_segment_overrun)
15451+ENDPROC(coprocessor_segment_overrun)
15452
15453 ENTRY(invalid_TSS)
15454 RING0_EC_FRAME
15455@@ -923,7 +1167,7 @@ ENTRY(invalid_TSS)
15456 CFI_ADJUST_CFA_OFFSET 4
15457 jmp error_code
15458 CFI_ENDPROC
15459-END(invalid_TSS)
15460+ENDPROC(invalid_TSS)
15461
15462 ENTRY(segment_not_present)
15463 RING0_EC_FRAME
15464@@ -931,7 +1175,7 @@ ENTRY(segment_not_present)
15465 CFI_ADJUST_CFA_OFFSET 4
15466 jmp error_code
15467 CFI_ENDPROC
15468-END(segment_not_present)
15469+ENDPROC(segment_not_present)
15470
15471 ENTRY(stack_segment)
15472 RING0_EC_FRAME
15473@@ -939,7 +1183,7 @@ ENTRY(stack_segment)
15474 CFI_ADJUST_CFA_OFFSET 4
15475 jmp error_code
15476 CFI_ENDPROC
15477-END(stack_segment)
15478+ENDPROC(stack_segment)
15479
15480 ENTRY(alignment_check)
15481 RING0_EC_FRAME
15482@@ -947,7 +1191,7 @@ ENTRY(alignment_check)
15483 CFI_ADJUST_CFA_OFFSET 4
15484 jmp error_code
15485 CFI_ENDPROC
15486-END(alignment_check)
15487+ENDPROC(alignment_check)
15488
15489 ENTRY(divide_error)
15490 RING0_INT_FRAME
15491@@ -957,7 +1201,7 @@ ENTRY(divide_error)
15492 CFI_ADJUST_CFA_OFFSET 4
15493 jmp error_code
15494 CFI_ENDPROC
15495-END(divide_error)
15496+ENDPROC(divide_error)
15497
15498 #ifdef CONFIG_X86_MCE
15499 ENTRY(machine_check)
15500@@ -968,7 +1212,7 @@ ENTRY(machine_check)
15501 CFI_ADJUST_CFA_OFFSET 4
15502 jmp error_code
15503 CFI_ENDPROC
15504-END(machine_check)
15505+ENDPROC(machine_check)
15506 #endif
15507
15508 ENTRY(spurious_interrupt_bug)
15509@@ -979,7 +1223,7 @@ ENTRY(spurious_interrupt_bug)
15510 CFI_ADJUST_CFA_OFFSET 4
15511 jmp error_code
15512 CFI_ENDPROC
15513-END(spurious_interrupt_bug)
15514+ENDPROC(spurious_interrupt_bug)
15515
15516 ENTRY(kernel_thread_helper)
15517 pushl $0 # fake return address for unwinder
15518@@ -1095,7 +1339,7 @@ ENDPROC(xen_failsafe_callback)
15519
15520 ENTRY(mcount)
15521 ret
15522-END(mcount)
15523+ENDPROC(mcount)
15524
15525 ENTRY(ftrace_caller)
15526 cmpl $0, function_trace_stop
15527@@ -1124,7 +1368,7 @@ ftrace_graph_call:
15528 .globl ftrace_stub
15529 ftrace_stub:
15530 ret
15531-END(ftrace_caller)
15532+ENDPROC(ftrace_caller)
15533
15534 #else /* ! CONFIG_DYNAMIC_FTRACE */
15535
15536@@ -1160,7 +1404,7 @@ trace:
15537 popl %ecx
15538 popl %eax
15539 jmp ftrace_stub
15540-END(mcount)
15541+ENDPROC(mcount)
15542 #endif /* CONFIG_DYNAMIC_FTRACE */
15543 #endif /* CONFIG_FUNCTION_TRACER */
15544
15545@@ -1181,7 +1425,7 @@ ENTRY(ftrace_graph_caller)
15546 popl %ecx
15547 popl %eax
15548 ret
15549-END(ftrace_graph_caller)
15550+ENDPROC(ftrace_graph_caller)
15551
15552 .globl return_to_handler
15553 return_to_handler:
15554@@ -1198,7 +1442,6 @@ return_to_handler:
15555 ret
15556 #endif
15557
15558-.section .rodata,"a"
15559 #include "syscall_table_32.S"
15560
15561 syscall_table_size=(.-sys_call_table)
15562@@ -1255,15 +1498,18 @@ error_code:
15563 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
15564 REG_TO_PTGS %ecx
15565 SET_KERNEL_GS %ecx
15566- movl $(__USER_DS), %ecx
15567+ movl $(__KERNEL_DS), %ecx
15568 movl %ecx, %ds
15569 movl %ecx, %es
15570+
15571+ pax_enter_kernel
15572+
15573 TRACE_IRQS_OFF
15574 movl %esp,%eax # pt_regs pointer
15575 call *%edi
15576 jmp ret_from_exception
15577 CFI_ENDPROC
15578-END(page_fault)
15579+ENDPROC(page_fault)
15580
15581 /*
15582 * Debug traps and NMI can happen at the one SYSENTER instruction
15583@@ -1309,7 +1555,7 @@ debug_stack_correct:
15584 call do_debug
15585 jmp ret_from_exception
15586 CFI_ENDPROC
15587-END(debug)
15588+ENDPROC(debug)
15589
15590 /*
15591 * NMI is doubly nasty. It can happen _while_ we're handling
15592@@ -1351,6 +1597,9 @@ nmi_stack_correct:
15593 xorl %edx,%edx # zero error code
15594 movl %esp,%eax # pt_regs pointer
15595 call do_nmi
15596+
15597+ pax_exit_kernel
15598+
15599 jmp restore_all_notrace
15600 CFI_ENDPROC
15601
15602@@ -1391,12 +1640,15 @@ nmi_espfix_stack:
15603 FIXUP_ESPFIX_STACK # %eax == %esp
15604 xorl %edx,%edx # zero error code
15605 call do_nmi
15606+
15607+ pax_exit_kernel
15608+
15609 RESTORE_REGS
15610 lss 12+4(%esp), %esp # back to espfix stack
15611 CFI_ADJUST_CFA_OFFSET -24
15612 jmp irq_return
15613 CFI_ENDPROC
15614-END(nmi)
15615+ENDPROC(nmi)
15616
15617 ENTRY(int3)
15618 RING0_INT_FRAME
15619@@ -1409,7 +1661,7 @@ ENTRY(int3)
15620 call do_int3
15621 jmp ret_from_exception
15622 CFI_ENDPROC
15623-END(int3)
15624+ENDPROC(int3)
15625
15626 ENTRY(general_protection)
15627 RING0_EC_FRAME
15628@@ -1417,7 +1669,7 @@ ENTRY(general_protection)
15629 CFI_ADJUST_CFA_OFFSET 4
15630 jmp error_code
15631 CFI_ENDPROC
15632-END(general_protection)
15633+ENDPROC(general_protection)
15634
15635 /*
15636 * End of kprobes section
15637diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
15638index 34a56a9..87790b4 100644
15639--- a/arch/x86/kernel/entry_64.S
15640+++ b/arch/x86/kernel/entry_64.S
15641@@ -53,6 +53,8 @@
15642 #include <asm/paravirt.h>
15643 #include <asm/ftrace.h>
15644 #include <asm/percpu.h>
15645+#include <asm/pgtable.h>
15646+#include <asm/alternative-asm.h>
15647
15648 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
15649 #include <linux/elf-em.h>
15650@@ -64,8 +66,9 @@
15651 #ifdef CONFIG_FUNCTION_TRACER
15652 #ifdef CONFIG_DYNAMIC_FTRACE
15653 ENTRY(mcount)
15654+ pax_force_retaddr
15655 retq
15656-END(mcount)
15657+ENDPROC(mcount)
15658
15659 ENTRY(ftrace_caller)
15660 cmpl $0, function_trace_stop
15661@@ -88,8 +91,9 @@ GLOBAL(ftrace_graph_call)
15662 #endif
15663
15664 GLOBAL(ftrace_stub)
15665+ pax_force_retaddr
15666 retq
15667-END(ftrace_caller)
15668+ENDPROC(ftrace_caller)
15669
15670 #else /* ! CONFIG_DYNAMIC_FTRACE */
15671 ENTRY(mcount)
15672@@ -108,6 +112,7 @@ ENTRY(mcount)
15673 #endif
15674
15675 GLOBAL(ftrace_stub)
15676+ pax_force_retaddr
15677 retq
15678
15679 trace:
15680@@ -117,12 +122,13 @@ trace:
15681 movq 8(%rbp), %rsi
15682 subq $MCOUNT_INSN_SIZE, %rdi
15683
15684+ pax_force_fptr ftrace_trace_function
15685 call *ftrace_trace_function
15686
15687 MCOUNT_RESTORE_FRAME
15688
15689 jmp ftrace_stub
15690-END(mcount)
15691+ENDPROC(mcount)
15692 #endif /* CONFIG_DYNAMIC_FTRACE */
15693 #endif /* CONFIG_FUNCTION_TRACER */
15694
15695@@ -142,8 +148,9 @@ ENTRY(ftrace_graph_caller)
15696
15697 MCOUNT_RESTORE_FRAME
15698
15699+ pax_force_retaddr
15700 retq
15701-END(ftrace_graph_caller)
15702+ENDPROC(ftrace_graph_caller)
15703
15704 GLOBAL(return_to_handler)
15705 subq $24, %rsp
15706@@ -159,6 +166,7 @@ GLOBAL(return_to_handler)
15707 movq 8(%rsp), %rdx
15708 movq (%rsp), %rax
15709 addq $16, %rsp
15710+ pax_force_retaddr
15711 retq
15712 #endif
15713
15714@@ -174,6 +182,282 @@ ENTRY(native_usergs_sysret64)
15715 ENDPROC(native_usergs_sysret64)
15716 #endif /* CONFIG_PARAVIRT */
15717
15718+ .macro ljmpq sel, off
15719+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
15720+ .byte 0x48; ljmp *1234f(%rip)
15721+ .pushsection .rodata
15722+ .align 16
15723+ 1234: .quad \off; .word \sel
15724+ .popsection
15725+#else
15726+ pushq $\sel
15727+ pushq $\off
15728+ lretq
15729+#endif
15730+ .endm
15731+
15732+ .macro pax_enter_kernel
15733+ pax_set_fptr_mask
15734+#ifdef CONFIG_PAX_KERNEXEC
15735+ call pax_enter_kernel
15736+#endif
15737+ .endm
15738+
15739+ .macro pax_exit_kernel
15740+#ifdef CONFIG_PAX_KERNEXEC
15741+ call pax_exit_kernel
15742+#endif
15743+ .endm
15744+
15745+#ifdef CONFIG_PAX_KERNEXEC
15746+ENTRY(pax_enter_kernel)
15747+ pushq %rdi
15748+
15749+#ifdef CONFIG_PARAVIRT
15750+ PV_SAVE_REGS(CLBR_RDI)
15751+#endif
15752+
15753+ GET_CR0_INTO_RDI
15754+ bts $16,%rdi
15755+ jnc 3f
15756+ mov %cs,%edi
15757+ cmp $__KERNEL_CS,%edi
15758+ jnz 2f
15759+1:
15760+
15761+#ifdef CONFIG_PARAVIRT
15762+ PV_RESTORE_REGS(CLBR_RDI)
15763+#endif
15764+
15765+ popq %rdi
15766+ pax_force_retaddr
15767+ retq
15768+
15769+2: ljmpq __KERNEL_CS,1f
15770+3: ljmpq __KERNEXEC_KERNEL_CS,4f
15771+4: SET_RDI_INTO_CR0
15772+ jmp 1b
15773+ENDPROC(pax_enter_kernel)
15774+
15775+ENTRY(pax_exit_kernel)
15776+ pushq %rdi
15777+
15778+#ifdef CONFIG_PARAVIRT
15779+ PV_SAVE_REGS(CLBR_RDI)
15780+#endif
15781+
15782+ mov %cs,%rdi
15783+ cmp $__KERNEXEC_KERNEL_CS,%edi
15784+ jz 2f
15785+1:
15786+
15787+#ifdef CONFIG_PARAVIRT
15788+ PV_RESTORE_REGS(CLBR_RDI);
15789+#endif
15790+
15791+ popq %rdi
15792+ pax_force_retaddr
15793+ retq
15794+
15795+2: GET_CR0_INTO_RDI
15796+ btr $16,%rdi
15797+ ljmpq __KERNEL_CS,3f
15798+3: SET_RDI_INTO_CR0
15799+ jmp 1b
15800+#ifdef CONFIG_PARAVIRT
15801+ PV_RESTORE_REGS(CLBR_RDI);
15802+#endif
15803+
15804+ popq %rdi
15805+ pax_force_retaddr
15806+ retq
15807+ENDPROC(pax_exit_kernel)
15808+#endif
15809+
15810+ .macro pax_enter_kernel_user
15811+ pax_set_fptr_mask
15812+#ifdef CONFIG_PAX_MEMORY_UDEREF
15813+ call pax_enter_kernel_user
15814+#endif
15815+ .endm
15816+
15817+ .macro pax_exit_kernel_user
15818+#ifdef CONFIG_PAX_MEMORY_UDEREF
15819+ call pax_exit_kernel_user
15820+#endif
15821+#ifdef CONFIG_PAX_RANDKSTACK
15822+ pushq %rax
15823+ call pax_randomize_kstack
15824+ popq %rax
15825+#endif
15826+ .endm
15827+
15828+#ifdef CONFIG_PAX_MEMORY_UDEREF
15829+ENTRY(pax_enter_kernel_user)
15830+ pushq %rdi
15831+ pushq %rbx
15832+
15833+#ifdef CONFIG_PARAVIRT
15834+ PV_SAVE_REGS(CLBR_RDI)
15835+#endif
15836+
15837+ GET_CR3_INTO_RDI
15838+ mov %rdi,%rbx
15839+ add $__START_KERNEL_map,%rbx
15840+ sub phys_base(%rip),%rbx
15841+
15842+#ifdef CONFIG_PARAVIRT
15843+ pushq %rdi
15844+ cmpl $0, pv_info+PARAVIRT_enabled
15845+ jz 1f
15846+ i = 0
15847+ .rept USER_PGD_PTRS
15848+ mov i*8(%rbx),%rsi
15849+ mov $0,%sil
15850+ lea i*8(%rbx),%rdi
15851+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15852+ i = i + 1
15853+ .endr
15854+ jmp 2f
15855+1:
15856+#endif
15857+
15858+ i = 0
15859+ .rept USER_PGD_PTRS
15860+ movb $0,i*8(%rbx)
15861+ i = i + 1
15862+ .endr
15863+
15864+#ifdef CONFIG_PARAVIRT
15865+2: popq %rdi
15866+#endif
15867+ SET_RDI_INTO_CR3
15868+
15869+#ifdef CONFIG_PAX_KERNEXEC
15870+ GET_CR0_INTO_RDI
15871+ bts $16,%rdi
15872+ SET_RDI_INTO_CR0
15873+#endif
15874+
15875+#ifdef CONFIG_PARAVIRT
15876+ PV_RESTORE_REGS(CLBR_RDI)
15877+#endif
15878+
15879+ popq %rbx
15880+ popq %rdi
15881+ pax_force_retaddr
15882+ retq
15883+ENDPROC(pax_enter_kernel_user)
15884+
15885+ENTRY(pax_exit_kernel_user)
15886+ push %rdi
15887+
15888+#ifdef CONFIG_PARAVIRT
15889+ pushq %rbx
15890+ PV_SAVE_REGS(CLBR_RDI)
15891+#endif
15892+
15893+#ifdef CONFIG_PAX_KERNEXEC
15894+ GET_CR0_INTO_RDI
15895+ btr $16,%rdi
15896+ SET_RDI_INTO_CR0
15897+#endif
15898+
15899+ GET_CR3_INTO_RDI
15900+ add $__START_KERNEL_map,%rdi
15901+ sub phys_base(%rip),%rdi
15902+
15903+#ifdef CONFIG_PARAVIRT
15904+ cmpl $0, pv_info+PARAVIRT_enabled
15905+ jz 1f
15906+ mov %rdi,%rbx
15907+ i = 0
15908+ .rept USER_PGD_PTRS
15909+ mov i*8(%rbx),%rsi
15910+ mov $0x67,%sil
15911+ lea i*8(%rbx),%rdi
15912+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15913+ i = i + 1
15914+ .endr
15915+ jmp 2f
15916+1:
15917+#endif
15918+
15919+ i = 0
15920+ .rept USER_PGD_PTRS
15921+ movb $0x67,i*8(%rdi)
15922+ i = i + 1
15923+ .endr
15924+
15925+#ifdef CONFIG_PARAVIRT
15926+2: PV_RESTORE_REGS(CLBR_RDI)
15927+ popq %rbx
15928+#endif
15929+
15930+ popq %rdi
15931+ pax_force_retaddr
15932+ retq
15933+ENDPROC(pax_exit_kernel_user)
15934+#endif
15935+
15936+.macro pax_erase_kstack
15937+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15938+ call pax_erase_kstack
15939+#endif
15940+.endm
15941+
15942+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15943+/*
15944+ * r11: thread_info
15945+ * rcx, rdx: can be clobbered
15946+ */
15947+ENTRY(pax_erase_kstack)
15948+ pushq %rdi
15949+ pushq %rax
15950+ pushq %r11
15951+
15952+ GET_THREAD_INFO(%r11)
15953+ mov TI_lowest_stack(%r11), %rdi
15954+ mov $-0xBEEF, %rax
15955+ std
15956+
15957+1: mov %edi, %ecx
15958+ and $THREAD_SIZE_asm - 1, %ecx
15959+ shr $3, %ecx
15960+ repne scasq
15961+ jecxz 2f
15962+
15963+ cmp $2*8, %ecx
15964+ jc 2f
15965+
15966+ mov $2*8, %ecx
15967+ repe scasq
15968+ jecxz 2f
15969+ jne 1b
15970+
15971+2: cld
15972+ mov %esp, %ecx
15973+ sub %edi, %ecx
15974+
15975+ cmp $THREAD_SIZE_asm, %rcx
15976+ jb 3f
15977+ ud2
15978+3:
15979+
15980+ shr $3, %ecx
15981+ rep stosq
15982+
15983+ mov TI_task_thread_sp0(%r11), %rdi
15984+ sub $256, %rdi
15985+ mov %rdi, TI_lowest_stack(%r11)
15986+
15987+ popq %r11
15988+ popq %rax
15989+ popq %rdi
15990+ pax_force_retaddr
15991+ ret
15992+ENDPROC(pax_erase_kstack)
15993+#endif
15994
15995 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
15996 #ifdef CONFIG_TRACE_IRQFLAGS
15997@@ -233,8 +517,8 @@ ENDPROC(native_usergs_sysret64)
15998 .endm
15999
16000 .macro UNFAKE_STACK_FRAME
16001- addq $8*6, %rsp
16002- CFI_ADJUST_CFA_OFFSET -(6*8)
16003+ addq $8*6 + ARG_SKIP, %rsp
16004+ CFI_ADJUST_CFA_OFFSET -(6*8 + ARG_SKIP)
16005 .endm
16006
16007 /*
16008@@ -317,7 +601,7 @@ ENTRY(save_args)
16009 leaq -ARGOFFSET+16(%rsp),%rdi /* arg1 for handler */
16010 movq_cfi rbp, 8 /* push %rbp */
16011 leaq 8(%rsp), %rbp /* mov %rsp, %ebp */
16012- testl $3, CS(%rdi)
16013+ testb $3, CS(%rdi)
16014 je 1f
16015 SWAPGS
16016 /*
16017@@ -337,9 +621,10 @@ ENTRY(save_args)
16018 * We entered an interrupt context - irqs are off:
16019 */
16020 2: TRACE_IRQS_OFF
16021+ pax_force_retaddr
16022 ret
16023 CFI_ENDPROC
16024-END(save_args)
16025+ENDPROC(save_args)
16026
16027 ENTRY(save_rest)
16028 PARTIAL_FRAME 1 REST_SKIP+8
16029@@ -352,9 +637,10 @@ ENTRY(save_rest)
16030 movq_cfi r15, R15+16
16031 movq %r11, 8(%rsp) /* return address */
16032 FIXUP_TOP_OF_STACK %r11, 16
16033+ pax_force_retaddr
16034 ret
16035 CFI_ENDPROC
16036-END(save_rest)
16037+ENDPROC(save_rest)
16038
16039 /* save complete stack frame */
16040 .pushsection .kprobes.text, "ax"
16041@@ -383,9 +669,10 @@ ENTRY(save_paranoid)
16042 js 1f /* negative -> in kernel */
16043 SWAPGS
16044 xorl %ebx,%ebx
16045-1: ret
16046+1: pax_force_retaddr_bts
16047+ ret
16048 CFI_ENDPROC
16049-END(save_paranoid)
16050+ENDPROC(save_paranoid)
16051 .popsection
16052
16053 /*
16054@@ -409,7 +696,7 @@ ENTRY(ret_from_fork)
16055
16056 RESTORE_REST
16057
16058- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
16059+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
16060 je int_ret_from_sys_call
16061
16062 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
16063@@ -419,7 +706,7 @@ ENTRY(ret_from_fork)
16064 jmp ret_from_sys_call # go to the SYSRET fastpath
16065
16066 CFI_ENDPROC
16067-END(ret_from_fork)
16068+ENDPROC(ret_from_fork)
16069
16070 /*
16071 * System call entry. Upto 6 arguments in registers are supported.
16072@@ -455,7 +742,7 @@ END(ret_from_fork)
16073 ENTRY(system_call)
16074 CFI_STARTPROC simple
16075 CFI_SIGNAL_FRAME
16076- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
16077+ CFI_DEF_CFA rsp,0
16078 CFI_REGISTER rip,rcx
16079 /*CFI_REGISTER rflags,r11*/
16080 SWAPGS_UNSAFE_STACK
16081@@ -468,12 +755,13 @@ ENTRY(system_call_after_swapgs)
16082
16083 movq %rsp,PER_CPU_VAR(old_rsp)
16084 movq PER_CPU_VAR(kernel_stack),%rsp
16085+ SAVE_ARGS 8*6,1
16086+ pax_enter_kernel_user
16087 /*
16088 * No need to follow this irqs off/on section - it's straight
16089 * and short:
16090 */
16091 ENABLE_INTERRUPTS(CLBR_NONE)
16092- SAVE_ARGS 8,1
16093 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
16094 movq %rcx,RIP-ARGOFFSET(%rsp)
16095 CFI_REL_OFFSET rip,RIP-ARGOFFSET
16096@@ -483,7 +771,7 @@ ENTRY(system_call_after_swapgs)
16097 system_call_fastpath:
16098 cmpq $__NR_syscall_max,%rax
16099 ja badsys
16100- movq %r10,%rcx
16101+ movq R10-ARGOFFSET(%rsp),%rcx
16102 call *sys_call_table(,%rax,8) # XXX: rip relative
16103 movq %rax,RAX-ARGOFFSET(%rsp)
16104 /*
16105@@ -502,6 +790,8 @@ sysret_check:
16106 andl %edi,%edx
16107 jnz sysret_careful
16108 CFI_REMEMBER_STATE
16109+ pax_exit_kernel_user
16110+ pax_erase_kstack
16111 /*
16112 * sysretq will re-enable interrupts:
16113 */
16114@@ -555,14 +845,18 @@ badsys:
16115 * jump back to the normal fast path.
16116 */
16117 auditsys:
16118- movq %r10,%r9 /* 6th arg: 4th syscall arg */
16119+ movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
16120 movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
16121 movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
16122 movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
16123 movq %rax,%rsi /* 2nd arg: syscall number */
16124 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
16125 call audit_syscall_entry
16126+
16127+ pax_erase_kstack
16128+
16129 LOAD_ARGS 0 /* reload call-clobbered registers */
16130+ pax_set_fptr_mask
16131 jmp system_call_fastpath
16132
16133 /*
16134@@ -592,16 +886,20 @@ tracesys:
16135 FIXUP_TOP_OF_STACK %rdi
16136 movq %rsp,%rdi
16137 call syscall_trace_enter
16138+
16139+ pax_erase_kstack
16140+
16141 /*
16142 * Reload arg registers from stack in case ptrace changed them.
16143 * We don't reload %rax because syscall_trace_enter() returned
16144 * the value it wants us to use in the table lookup.
16145 */
16146 LOAD_ARGS ARGOFFSET, 1
16147+ pax_set_fptr_mask
16148 RESTORE_REST
16149 cmpq $__NR_syscall_max,%rax
16150 ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
16151- movq %r10,%rcx /* fixup for C */
16152+ movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
16153 call *sys_call_table(,%rax,8)
16154 movq %rax,RAX-ARGOFFSET(%rsp)
16155 /* Use IRET because user could have changed frame */
16156@@ -613,7 +911,7 @@ tracesys:
16157 GLOBAL(int_ret_from_sys_call)
16158 DISABLE_INTERRUPTS(CLBR_NONE)
16159 TRACE_IRQS_OFF
16160- testl $3,CS-ARGOFFSET(%rsp)
16161+ testb $3,CS-ARGOFFSET(%rsp)
16162 je retint_restore_args
16163 movl $_TIF_ALLWORK_MASK,%edi
16164 /* edi: mask to check */
16165@@ -624,6 +922,7 @@ GLOBAL(int_with_check)
16166 andl %edi,%edx
16167 jnz int_careful
16168 andl $~TS_COMPAT,TI_status(%rcx)
16169+ pax_erase_kstack
16170 jmp retint_swapgs
16171
16172 /* Either reschedule or signal or syscall exit tracking needed. */
16173@@ -674,7 +973,7 @@ int_restore_rest:
16174 TRACE_IRQS_OFF
16175 jmp int_with_check
16176 CFI_ENDPROC
16177-END(system_call)
16178+ENDPROC(system_call)
16179
16180 /*
16181 * Certain special system calls that need to save a complete full stack frame.
16182@@ -690,7 +989,7 @@ ENTRY(\label)
16183 call \func
16184 jmp ptregscall_common
16185 CFI_ENDPROC
16186-END(\label)
16187+ENDPROC(\label)
16188 .endm
16189
16190 PTREGSCALL stub_clone, sys_clone, %r8
16191@@ -708,9 +1007,10 @@ ENTRY(ptregscall_common)
16192 movq_cfi_restore R12+8, r12
16193 movq_cfi_restore RBP+8, rbp
16194 movq_cfi_restore RBX+8, rbx
16195+ pax_force_retaddr
16196 ret $REST_SKIP /* pop extended registers */
16197 CFI_ENDPROC
16198-END(ptregscall_common)
16199+ENDPROC(ptregscall_common)
16200
16201 ENTRY(stub_execve)
16202 CFI_STARTPROC
16203@@ -726,7 +1026,7 @@ ENTRY(stub_execve)
16204 RESTORE_REST
16205 jmp int_ret_from_sys_call
16206 CFI_ENDPROC
16207-END(stub_execve)
16208+ENDPROC(stub_execve)
16209
16210 /*
16211 * sigreturn is special because it needs to restore all registers on return.
16212@@ -744,7 +1044,7 @@ ENTRY(stub_rt_sigreturn)
16213 RESTORE_REST
16214 jmp int_ret_from_sys_call
16215 CFI_ENDPROC
16216-END(stub_rt_sigreturn)
16217+ENDPROC(stub_rt_sigreturn)
16218
16219 /*
16220 * Build the entry stubs and pointer table with some assembler magic.
16221@@ -780,7 +1080,7 @@ vector=vector+1
16222 2: jmp common_interrupt
16223 .endr
16224 CFI_ENDPROC
16225-END(irq_entries_start)
16226+ENDPROC(irq_entries_start)
16227
16228 .previous
16229 END(interrupt)
16230@@ -800,6 +1100,16 @@ END(interrupt)
16231 CFI_ADJUST_CFA_OFFSET 10*8
16232 call save_args
16233 PARTIAL_FRAME 0
16234+#ifdef CONFIG_PAX_MEMORY_UDEREF
16235+ testb $3, CS(%rdi)
16236+ jnz 1f
16237+ pax_enter_kernel
16238+ jmp 2f
16239+1: pax_enter_kernel_user
16240+2:
16241+#else
16242+ pax_enter_kernel
16243+#endif
16244 call \func
16245 .endm
16246
16247@@ -822,7 +1132,7 @@ ret_from_intr:
16248 CFI_ADJUST_CFA_OFFSET -8
16249 exit_intr:
16250 GET_THREAD_INFO(%rcx)
16251- testl $3,CS-ARGOFFSET(%rsp)
16252+ testb $3,CS-ARGOFFSET(%rsp)
16253 je retint_kernel
16254
16255 /* Interrupt came from user space */
16256@@ -844,12 +1154,15 @@ retint_swapgs: /* return to user-space */
16257 * The iretq could re-enable interrupts:
16258 */
16259 DISABLE_INTERRUPTS(CLBR_ANY)
16260+ pax_exit_kernel_user
16261 TRACE_IRQS_IRETQ
16262 SWAPGS
16263 jmp restore_args
16264
16265 retint_restore_args: /* return to kernel space */
16266 DISABLE_INTERRUPTS(CLBR_ANY)
16267+ pax_exit_kernel
16268+ pax_force_retaddr RIP-ARGOFFSET
16269 /*
16270 * The iretq could re-enable interrupts:
16271 */
16272@@ -940,7 +1253,7 @@ ENTRY(retint_kernel)
16273 #endif
16274
16275 CFI_ENDPROC
16276-END(common_interrupt)
16277+ENDPROC(common_interrupt)
16278
16279 /*
16280 * APIC interrupts.
16281@@ -953,7 +1266,7 @@ ENTRY(\sym)
16282 interrupt \do_sym
16283 jmp ret_from_intr
16284 CFI_ENDPROC
16285-END(\sym)
16286+ENDPROC(\sym)
16287 .endm
16288
16289 #ifdef CONFIG_SMP
16290@@ -1032,12 +1345,22 @@ ENTRY(\sym)
16291 CFI_ADJUST_CFA_OFFSET 15*8
16292 call error_entry
16293 DEFAULT_FRAME 0
16294+#ifdef CONFIG_PAX_MEMORY_UDEREF
16295+ testb $3, CS(%rsp)
16296+ jnz 1f
16297+ pax_enter_kernel
16298+ jmp 2f
16299+1: pax_enter_kernel_user
16300+2:
16301+#else
16302+ pax_enter_kernel
16303+#endif
16304 movq %rsp,%rdi /* pt_regs pointer */
16305 xorl %esi,%esi /* no error code */
16306 call \do_sym
16307 jmp error_exit /* %ebx: no swapgs flag */
16308 CFI_ENDPROC
16309-END(\sym)
16310+ENDPROC(\sym)
16311 .endm
16312
16313 .macro paranoidzeroentry sym do_sym
16314@@ -1049,12 +1372,22 @@ ENTRY(\sym)
16315 subq $15*8, %rsp
16316 call save_paranoid
16317 TRACE_IRQS_OFF
16318+#ifdef CONFIG_PAX_MEMORY_UDEREF
16319+ testb $3, CS(%rsp)
16320+ jnz 1f
16321+ pax_enter_kernel
16322+ jmp 2f
16323+1: pax_enter_kernel_user
16324+2:
16325+#else
16326+ pax_enter_kernel
16327+#endif
16328 movq %rsp,%rdi /* pt_regs pointer */
16329 xorl %esi,%esi /* no error code */
16330 call \do_sym
16331 jmp paranoid_exit /* %ebx: no swapgs flag */
16332 CFI_ENDPROC
16333-END(\sym)
16334+ENDPROC(\sym)
16335 .endm
16336
16337 .macro paranoidzeroentry_ist sym do_sym ist
16338@@ -1066,15 +1399,30 @@ ENTRY(\sym)
16339 subq $15*8, %rsp
16340 call save_paranoid
16341 TRACE_IRQS_OFF
16342+#ifdef CONFIG_PAX_MEMORY_UDEREF
16343+ testb $3, CS(%rsp)
16344+ jnz 1f
16345+ pax_enter_kernel
16346+ jmp 2f
16347+1: pax_enter_kernel_user
16348+2:
16349+#else
16350+ pax_enter_kernel
16351+#endif
16352 movq %rsp,%rdi /* pt_regs pointer */
16353 xorl %esi,%esi /* no error code */
16354- PER_CPU(init_tss, %rbp)
16355+#ifdef CONFIG_SMP
16356+ imul $TSS_size, PER_CPU_VAR(cpu_number), %ebp
16357+ lea init_tss(%rbp), %rbp
16358+#else
16359+ lea init_tss(%rip), %rbp
16360+#endif
16361 subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
16362 call \do_sym
16363 addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
16364 jmp paranoid_exit /* %ebx: no swapgs flag */
16365 CFI_ENDPROC
16366-END(\sym)
16367+ENDPROC(\sym)
16368 .endm
16369
16370 .macro errorentry sym do_sym
16371@@ -1085,13 +1433,23 @@ ENTRY(\sym)
16372 CFI_ADJUST_CFA_OFFSET 15*8
16373 call error_entry
16374 DEFAULT_FRAME 0
16375+#ifdef CONFIG_PAX_MEMORY_UDEREF
16376+ testb $3, CS(%rsp)
16377+ jnz 1f
16378+ pax_enter_kernel
16379+ jmp 2f
16380+1: pax_enter_kernel_user
16381+2:
16382+#else
16383+ pax_enter_kernel
16384+#endif
16385 movq %rsp,%rdi /* pt_regs pointer */
16386 movq ORIG_RAX(%rsp),%rsi /* get error code */
16387 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
16388 call \do_sym
16389 jmp error_exit /* %ebx: no swapgs flag */
16390 CFI_ENDPROC
16391-END(\sym)
16392+ENDPROC(\sym)
16393 .endm
16394
16395 /* error code is on the stack already */
16396@@ -1104,13 +1462,23 @@ ENTRY(\sym)
16397 call save_paranoid
16398 DEFAULT_FRAME 0
16399 TRACE_IRQS_OFF
16400+#ifdef CONFIG_PAX_MEMORY_UDEREF
16401+ testb $3, CS(%rsp)
16402+ jnz 1f
16403+ pax_enter_kernel
16404+ jmp 2f
16405+1: pax_enter_kernel_user
16406+2:
16407+#else
16408+ pax_enter_kernel
16409+#endif
16410 movq %rsp,%rdi /* pt_regs pointer */
16411 movq ORIG_RAX(%rsp),%rsi /* get error code */
16412 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
16413 call \do_sym
16414 jmp paranoid_exit /* %ebx: no swapgs flag */
16415 CFI_ENDPROC
16416-END(\sym)
16417+ENDPROC(\sym)
16418 .endm
16419
16420 zeroentry divide_error do_divide_error
16421@@ -1141,9 +1509,10 @@ gs_change:
16422 SWAPGS
16423 popf
16424 CFI_ADJUST_CFA_OFFSET -8
16425+ pax_force_retaddr
16426 ret
16427 CFI_ENDPROC
16428-END(native_load_gs_index)
16429+ENDPROC(native_load_gs_index)
16430
16431 .section __ex_table,"a"
16432 .align 8
16433@@ -1193,11 +1562,12 @@ ENTRY(kernel_thread)
16434 * of hacks for example to fork off the per-CPU idle tasks.
16435 * [Hopefully no generic code relies on the reschedule -AK]
16436 */
16437- RESTORE_ALL
16438+ RESTORE_REST
16439 UNFAKE_STACK_FRAME
16440+ pax_force_retaddr
16441 ret
16442 CFI_ENDPROC
16443-END(kernel_thread)
16444+ENDPROC(kernel_thread)
16445
16446 ENTRY(child_rip)
16447 pushq $0 # fake return address
16448@@ -1208,13 +1578,14 @@ ENTRY(child_rip)
16449 */
16450 movq %rdi, %rax
16451 movq %rsi, %rdi
16452+ pax_force_fptr %rax
16453 call *%rax
16454 # exit
16455 mov %eax, %edi
16456 call do_exit
16457 ud2 # padding for call trace
16458 CFI_ENDPROC
16459-END(child_rip)
16460+ENDPROC(child_rip)
16461
16462 /*
16463 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
16464@@ -1241,11 +1612,11 @@ ENTRY(kernel_execve)
16465 RESTORE_REST
16466 testq %rax,%rax
16467 je int_ret_from_sys_call
16468- RESTORE_ARGS
16469 UNFAKE_STACK_FRAME
16470+ pax_force_retaddr
16471 ret
16472 CFI_ENDPROC
16473-END(kernel_execve)
16474+ENDPROC(kernel_execve)
16475
16476 /* Call softirq on interrupt stack. Interrupts are off. */
16477 ENTRY(call_softirq)
16478@@ -1263,9 +1634,10 @@ ENTRY(call_softirq)
16479 CFI_DEF_CFA_REGISTER rsp
16480 CFI_ADJUST_CFA_OFFSET -8
16481 decl PER_CPU_VAR(irq_count)
16482+ pax_force_retaddr
16483 ret
16484 CFI_ENDPROC
16485-END(call_softirq)
16486+ENDPROC(call_softirq)
16487
16488 #ifdef CONFIG_XEN
16489 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
16490@@ -1303,7 +1675,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
16491 decl PER_CPU_VAR(irq_count)
16492 jmp error_exit
16493 CFI_ENDPROC
16494-END(xen_do_hypervisor_callback)
16495+ENDPROC(xen_do_hypervisor_callback)
16496
16497 /*
16498 * Hypervisor uses this for application faults while it executes.
16499@@ -1362,7 +1734,7 @@ ENTRY(xen_failsafe_callback)
16500 SAVE_ALL
16501 jmp error_exit
16502 CFI_ENDPROC
16503-END(xen_failsafe_callback)
16504+ENDPROC(xen_failsafe_callback)
16505
16506 #endif /* CONFIG_XEN */
16507
16508@@ -1405,16 +1777,31 @@ ENTRY(paranoid_exit)
16509 TRACE_IRQS_OFF
16510 testl %ebx,%ebx /* swapgs needed? */
16511 jnz paranoid_restore
16512- testl $3,CS(%rsp)
16513+ testb $3,CS(%rsp)
16514 jnz paranoid_userspace
16515+#ifdef CONFIG_PAX_MEMORY_UDEREF
16516+ pax_exit_kernel
16517+ TRACE_IRQS_IRETQ 0
16518+ SWAPGS_UNSAFE_STACK
16519+ RESTORE_ALL 8
16520+ pax_force_retaddr_bts
16521+ jmp irq_return
16522+#endif
16523 paranoid_swapgs:
16524+#ifdef CONFIG_PAX_MEMORY_UDEREF
16525+ pax_exit_kernel_user
16526+#else
16527+ pax_exit_kernel
16528+#endif
16529 TRACE_IRQS_IRETQ 0
16530 SWAPGS_UNSAFE_STACK
16531 RESTORE_ALL 8
16532 jmp irq_return
16533 paranoid_restore:
16534+ pax_exit_kernel
16535 TRACE_IRQS_IRETQ 0
16536 RESTORE_ALL 8
16537+ pax_force_retaddr_bts
16538 jmp irq_return
16539 paranoid_userspace:
16540 GET_THREAD_INFO(%rcx)
16541@@ -1443,7 +1830,7 @@ paranoid_schedule:
16542 TRACE_IRQS_OFF
16543 jmp paranoid_userspace
16544 CFI_ENDPROC
16545-END(paranoid_exit)
16546+ENDPROC(paranoid_exit)
16547
16548 /*
16549 * Exception entry point. This expects an error code/orig_rax on the stack.
16550@@ -1470,12 +1857,13 @@ ENTRY(error_entry)
16551 movq_cfi r14, R14+8
16552 movq_cfi r15, R15+8
16553 xorl %ebx,%ebx
16554- testl $3,CS+8(%rsp)
16555+ testb $3,CS+8(%rsp)
16556 je error_kernelspace
16557 error_swapgs:
16558 SWAPGS
16559 error_sti:
16560 TRACE_IRQS_OFF
16561+ pax_force_retaddr_bts
16562 ret
16563 CFI_ENDPROC
16564
16565@@ -1497,7 +1885,7 @@ error_kernelspace:
16566 cmpq $gs_change,RIP+8(%rsp)
16567 je error_swapgs
16568 jmp error_sti
16569-END(error_entry)
16570+ENDPROC(error_entry)
16571
16572
16573 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
16574@@ -1517,7 +1905,7 @@ ENTRY(error_exit)
16575 jnz retint_careful
16576 jmp retint_swapgs
16577 CFI_ENDPROC
16578-END(error_exit)
16579+ENDPROC(error_exit)
16580
16581
16582 /* runs on exception stack */
16583@@ -1529,6 +1917,16 @@ ENTRY(nmi)
16584 CFI_ADJUST_CFA_OFFSET 15*8
16585 call save_paranoid
16586 DEFAULT_FRAME 0
16587+#ifdef CONFIG_PAX_MEMORY_UDEREF
16588+ testb $3, CS(%rsp)
16589+ jnz 1f
16590+ pax_enter_kernel
16591+ jmp 2f
16592+1: pax_enter_kernel_user
16593+2:
16594+#else
16595+ pax_enter_kernel
16596+#endif
16597 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
16598 movq %rsp,%rdi
16599 movq $-1,%rsi
16600@@ -1539,12 +1937,28 @@ ENTRY(nmi)
16601 DISABLE_INTERRUPTS(CLBR_NONE)
16602 testl %ebx,%ebx /* swapgs needed? */
16603 jnz nmi_restore
16604- testl $3,CS(%rsp)
16605+ testb $3,CS(%rsp)
16606 jnz nmi_userspace
16607+#ifdef CONFIG_PAX_MEMORY_UDEREF
16608+ pax_exit_kernel
16609+ SWAPGS_UNSAFE_STACK
16610+ RESTORE_ALL 8
16611+ pax_force_retaddr_bts
16612+ jmp irq_return
16613+#endif
16614 nmi_swapgs:
16615+#ifdef CONFIG_PAX_MEMORY_UDEREF
16616+ pax_exit_kernel_user
16617+#else
16618+ pax_exit_kernel
16619+#endif
16620 SWAPGS_UNSAFE_STACK
16621+ RESTORE_ALL 8
16622+ jmp irq_return
16623 nmi_restore:
16624+ pax_exit_kernel
16625 RESTORE_ALL 8
16626+ pax_force_retaddr_bts
16627 jmp irq_return
16628 nmi_userspace:
16629 GET_THREAD_INFO(%rcx)
16630@@ -1573,14 +1987,14 @@ nmi_schedule:
16631 jmp paranoid_exit
16632 CFI_ENDPROC
16633 #endif
16634-END(nmi)
16635+ENDPROC(nmi)
16636
16637 ENTRY(ignore_sysret)
16638 CFI_STARTPROC
16639 mov $-ENOSYS,%eax
16640 sysret
16641 CFI_ENDPROC
16642-END(ignore_sysret)
16643+ENDPROC(ignore_sysret)
16644
16645 /*
16646 * End of kprobes section
16647diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
16648index 9dbb527..7b3615a 100644
16649--- a/arch/x86/kernel/ftrace.c
16650+++ b/arch/x86/kernel/ftrace.c
16651@@ -103,7 +103,7 @@ static void *mod_code_ip; /* holds the IP to write to */
16652 static void *mod_code_newcode; /* holds the text to write to the IP */
16653
16654 static unsigned nmi_wait_count;
16655-static atomic_t nmi_update_count = ATOMIC_INIT(0);
16656+static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
16657
16658 int ftrace_arch_read_dyn_info(char *buf, int size)
16659 {
16660@@ -111,7 +111,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
16661
16662 r = snprintf(buf, size, "%u %u",
16663 nmi_wait_count,
16664- atomic_read(&nmi_update_count));
16665+ atomic_read_unchecked(&nmi_update_count));
16666 return r;
16667 }
16668
16669@@ -149,8 +149,10 @@ void ftrace_nmi_enter(void)
16670 {
16671 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
16672 smp_rmb();
16673+ pax_open_kernel();
16674 ftrace_mod_code();
16675- atomic_inc(&nmi_update_count);
16676+ pax_close_kernel();
16677+ atomic_inc_unchecked(&nmi_update_count);
16678 }
16679 /* Must have previous changes seen before executions */
16680 smp_mb();
16681@@ -215,7 +217,7 @@ do_ftrace_mod_code(unsigned long ip, void *new_code)
16682
16683
16684
16685-static unsigned char ftrace_nop[MCOUNT_INSN_SIZE];
16686+static unsigned char ftrace_nop[MCOUNT_INSN_SIZE] __read_only;
16687
16688 static unsigned char *ftrace_nop_replace(void)
16689 {
16690@@ -228,6 +230,8 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
16691 {
16692 unsigned char replaced[MCOUNT_INSN_SIZE];
16693
16694+ ip = ktla_ktva(ip);
16695+
16696 /*
16697 * Note: Due to modules and __init, code can
16698 * disappear and change, we need to protect against faulting
16699@@ -284,7 +288,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
16700 unsigned char old[MCOUNT_INSN_SIZE], *new;
16701 int ret;
16702
16703- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
16704+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
16705 new = ftrace_call_replace(ip, (unsigned long)func);
16706 ret = ftrace_modify_code(ip, old, new);
16707
16708@@ -337,15 +341,15 @@ int __init ftrace_dyn_arch_init(void *data)
16709 switch (faulted) {
16710 case 0:
16711 pr_info("ftrace: converting mcount calls to 0f 1f 44 00 00\n");
16712- memcpy(ftrace_nop, ftrace_test_p6nop, MCOUNT_INSN_SIZE);
16713+ memcpy(ftrace_nop, ktla_ktva(ftrace_test_p6nop), MCOUNT_INSN_SIZE);
16714 break;
16715 case 1:
16716 pr_info("ftrace: converting mcount calls to 66 66 66 66 90\n");
16717- memcpy(ftrace_nop, ftrace_test_nop5, MCOUNT_INSN_SIZE);
16718+ memcpy(ftrace_nop, ktla_ktva(ftrace_test_nop5), MCOUNT_INSN_SIZE);
16719 break;
16720 case 2:
16721 pr_info("ftrace: converting mcount calls to jmp . + 5\n");
16722- memcpy(ftrace_nop, ftrace_test_jmp, MCOUNT_INSN_SIZE);
16723+ memcpy(ftrace_nop, ktla_ktva(ftrace_test_jmp), MCOUNT_INSN_SIZE);
16724 break;
16725 }
16726
16727@@ -366,6 +370,8 @@ static int ftrace_mod_jmp(unsigned long ip,
16728 {
16729 unsigned char code[MCOUNT_INSN_SIZE];
16730
16731+ ip = ktla_ktva(ip);
16732+
16733 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
16734 return -EFAULT;
16735
16736diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
16737index 4f8e250..df24706 100644
16738--- a/arch/x86/kernel/head32.c
16739+++ b/arch/x86/kernel/head32.c
16740@@ -16,6 +16,7 @@
16741 #include <asm/apic.h>
16742 #include <asm/io_apic.h>
16743 #include <asm/bios_ebda.h>
16744+#include <asm/boot.h>
16745
16746 static void __init i386_default_early_setup(void)
16747 {
16748@@ -31,7 +32,7 @@ void __init i386_start_kernel(void)
16749 {
16750 reserve_trampoline_memory();
16751
16752- reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
16753+ reserve_early(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
16754
16755 #ifdef CONFIG_BLK_DEV_INITRD
16756 /* Reserve INITRD */
16757diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
16758index 34c3308..6fc4e76 100644
16759--- a/arch/x86/kernel/head_32.S
16760+++ b/arch/x86/kernel/head_32.S
16761@@ -19,10 +19,17 @@
16762 #include <asm/setup.h>
16763 #include <asm/processor-flags.h>
16764 #include <asm/percpu.h>
16765+#include <asm/msr-index.h>
16766
16767 /* Physical address */
16768 #define pa(X) ((X) - __PAGE_OFFSET)
16769
16770+#ifdef CONFIG_PAX_KERNEXEC
16771+#define ta(X) (X)
16772+#else
16773+#define ta(X) ((X) - __PAGE_OFFSET)
16774+#endif
16775+
16776 /*
16777 * References to members of the new_cpu_data structure.
16778 */
16779@@ -52,11 +59,7 @@
16780 * and small than max_low_pfn, otherwise will waste some page table entries
16781 */
16782
16783-#if PTRS_PER_PMD > 1
16784-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
16785-#else
16786-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
16787-#endif
16788+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
16789
16790 /* Enough space to fit pagetables for the low memory linear map */
16791 MAPPING_BEYOND_END = \
16792@@ -73,6 +76,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE_asm
16793 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16794
16795 /*
16796+ * Real beginning of normal "text" segment
16797+ */
16798+ENTRY(stext)
16799+ENTRY(_stext)
16800+
16801+/*
16802 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
16803 * %esi points to the real-mode code as a 32-bit pointer.
16804 * CS and DS must be 4 GB flat segments, but we don't depend on
16805@@ -80,7 +89,16 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16806 * can.
16807 */
16808 __HEAD
16809+
16810+#ifdef CONFIG_PAX_KERNEXEC
16811+ jmp startup_32
16812+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
16813+.fill PAGE_SIZE-5,1,0xcc
16814+#endif
16815+
16816 ENTRY(startup_32)
16817+ movl pa(stack_start),%ecx
16818+
16819 /* test KEEP_SEGMENTS flag to see if the bootloader is asking
16820 us to not reload segments */
16821 testb $(1<<6), BP_loadflags(%esi)
16822@@ -95,7 +113,60 @@ ENTRY(startup_32)
16823 movl %eax,%es
16824 movl %eax,%fs
16825 movl %eax,%gs
16826+ movl %eax,%ss
16827 2:
16828+ leal -__PAGE_OFFSET(%ecx),%esp
16829+
16830+#ifdef CONFIG_SMP
16831+ movl $pa(cpu_gdt_table),%edi
16832+ movl $__per_cpu_load,%eax
16833+ movw %ax,__KERNEL_PERCPU + 2(%edi)
16834+ rorl $16,%eax
16835+ movb %al,__KERNEL_PERCPU + 4(%edi)
16836+ movb %ah,__KERNEL_PERCPU + 7(%edi)
16837+ movl $__per_cpu_end - 1,%eax
16838+ subl $__per_cpu_start,%eax
16839+ movw %ax,__KERNEL_PERCPU + 0(%edi)
16840+#endif
16841+
16842+#ifdef CONFIG_PAX_MEMORY_UDEREF
16843+ movl $NR_CPUS,%ecx
16844+ movl $pa(cpu_gdt_table),%edi
16845+1:
16846+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
16847+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
16848+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
16849+ addl $PAGE_SIZE_asm,%edi
16850+ loop 1b
16851+#endif
16852+
16853+#ifdef CONFIG_PAX_KERNEXEC
16854+ movl $pa(boot_gdt),%edi
16855+ movl $__LOAD_PHYSICAL_ADDR,%eax
16856+ movw %ax,__BOOT_CS + 2(%edi)
16857+ rorl $16,%eax
16858+ movb %al,__BOOT_CS + 4(%edi)
16859+ movb %ah,__BOOT_CS + 7(%edi)
16860+ rorl $16,%eax
16861+
16862+ ljmp $(__BOOT_CS),$1f
16863+1:
16864+
16865+ movl $NR_CPUS,%ecx
16866+ movl $pa(cpu_gdt_table),%edi
16867+ addl $__PAGE_OFFSET,%eax
16868+1:
16869+ movw %ax,__KERNEL_CS + 2(%edi)
16870+ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
16871+ rorl $16,%eax
16872+ movb %al,__KERNEL_CS + 4(%edi)
16873+ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
16874+ movb %ah,__KERNEL_CS + 7(%edi)
16875+ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
16876+ rorl $16,%eax
16877+ addl $PAGE_SIZE_asm,%edi
16878+ loop 1b
16879+#endif
16880
16881 /*
16882 * Clear BSS first so that there are no surprises...
16883@@ -140,9 +211,7 @@ ENTRY(startup_32)
16884 cmpl $num_subarch_entries, %eax
16885 jae bad_subarch
16886
16887- movl pa(subarch_entries)(,%eax,4), %eax
16888- subl $__PAGE_OFFSET, %eax
16889- jmp *%eax
16890+ jmp *pa(subarch_entries)(,%eax,4)
16891
16892 bad_subarch:
16893 WEAK(lguest_entry)
16894@@ -154,10 +223,10 @@ WEAK(xen_entry)
16895 __INITDATA
16896
16897 subarch_entries:
16898- .long default_entry /* normal x86/PC */
16899- .long lguest_entry /* lguest hypervisor */
16900- .long xen_entry /* Xen hypervisor */
16901- .long default_entry /* Moorestown MID */
16902+ .long ta(default_entry) /* normal x86/PC */
16903+ .long ta(lguest_entry) /* lguest hypervisor */
16904+ .long ta(xen_entry) /* Xen hypervisor */
16905+ .long ta(default_entry) /* Moorestown MID */
16906 num_subarch_entries = (. - subarch_entries) / 4
16907 .previous
16908 #endif /* CONFIG_PARAVIRT */
16909@@ -218,8 +287,11 @@ default_entry:
16910 movl %eax, pa(max_pfn_mapped)
16911
16912 /* Do early initialization of the fixmap area */
16913- movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax
16914- movl %eax,pa(swapper_pg_pmd+0x1000*KPMDS-8)
16915+#ifdef CONFIG_COMPAT_VDSO
16916+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_pmd+0x1000*KPMDS-8)
16917+#else
16918+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_pmd+0x1000*KPMDS-8)
16919+#endif
16920 #else /* Not PAE */
16921
16922 page_pde_offset = (__PAGE_OFFSET >> 20);
16923@@ -249,8 +321,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16924 movl %eax, pa(max_pfn_mapped)
16925
16926 /* Do early initialization of the fixmap area */
16927- movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax
16928- movl %eax,pa(swapper_pg_dir+0xffc)
16929+#ifdef CONFIG_COMPAT_VDSO
16930+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_dir+0xffc)
16931+#else
16932+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_dir+0xffc)
16933+#endif
16934 #endif
16935 jmp 3f
16936 /*
16937@@ -272,6 +347,9 @@ ENTRY(startup_32_smp)
16938 movl %eax,%es
16939 movl %eax,%fs
16940 movl %eax,%gs
16941+ movl pa(stack_start),%ecx
16942+ movl %eax,%ss
16943+ leal -__PAGE_OFFSET(%ecx),%esp
16944 #endif /* CONFIG_SMP */
16945 3:
16946
16947@@ -297,6 +375,7 @@ ENTRY(startup_32_smp)
16948 orl %edx,%eax
16949 movl %eax,%cr4
16950
16951+#ifdef CONFIG_X86_PAE
16952 btl $5, %eax # check if PAE is enabled
16953 jnc 6f
16954
16955@@ -305,6 +384,10 @@ ENTRY(startup_32_smp)
16956 cpuid
16957 cmpl $0x80000000, %eax
16958 jbe 6f
16959+
16960+ /* Clear bogus XD_DISABLE bits */
16961+ call verify_cpu
16962+
16963 mov $0x80000001, %eax
16964 cpuid
16965 /* Execute Disable bit supported? */
16966@@ -312,13 +395,17 @@ ENTRY(startup_32_smp)
16967 jnc 6f
16968
16969 /* Setup EFER (Extended Feature Enable Register) */
16970- movl $0xc0000080, %ecx
16971+ movl $MSR_EFER, %ecx
16972 rdmsr
16973
16974 btsl $11, %eax
16975 /* Make changes effective */
16976 wrmsr
16977
16978+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
16979+ movl $1,pa(nx_enabled)
16980+#endif
16981+
16982 6:
16983
16984 /*
16985@@ -331,8 +418,8 @@ ENTRY(startup_32_smp)
16986 movl %eax,%cr0 /* ..and set paging (PG) bit */
16987 ljmp $__BOOT_CS,$1f /* Clear prefetch and normalize %eip */
16988 1:
16989- /* Set up the stack pointer */
16990- lss stack_start,%esp
16991+ /* Shift the stack pointer to a virtual address */
16992+ addl $__PAGE_OFFSET, %esp
16993
16994 /*
16995 * Initialize eflags. Some BIOS's leave bits like NT set. This would
16996@@ -344,9 +431,7 @@ ENTRY(startup_32_smp)
16997
16998 #ifdef CONFIG_SMP
16999 cmpb $0, ready
17000- jz 1f /* Initial CPU cleans BSS */
17001- jmp checkCPUtype
17002-1:
17003+ jnz checkCPUtype
17004 #endif /* CONFIG_SMP */
17005
17006 /*
17007@@ -424,7 +509,7 @@ is386: movl $2,%ecx # set MP
17008 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
17009 movl %eax,%ss # after changing gdt.
17010
17011- movl $(__USER_DS),%eax # DS/ES contains default USER segment
17012+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
17013 movl %eax,%ds
17014 movl %eax,%es
17015
17016@@ -438,15 +523,22 @@ is386: movl $2,%ecx # set MP
17017 */
17018 cmpb $0,ready
17019 jne 1f
17020- movl $per_cpu__gdt_page,%eax
17021+ movl $cpu_gdt_table,%eax
17022 movl $per_cpu__stack_canary,%ecx
17023+#ifdef CONFIG_SMP
17024+ addl $__per_cpu_load,%ecx
17025+#endif
17026 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
17027 shrl $16, %ecx
17028 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
17029 movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
17030 1:
17031-#endif
17032 movl $(__KERNEL_STACK_CANARY),%eax
17033+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
17034+ movl $(__USER_DS),%eax
17035+#else
17036+ xorl %eax,%eax
17037+#endif
17038 movl %eax,%gs
17039
17040 xorl %eax,%eax # Clear LDT
17041@@ -454,14 +546,7 @@ is386: movl $2,%ecx # set MP
17042
17043 cld # gcc2 wants the direction flag cleared at all times
17044 pushl $0 # fake return address for unwinder
17045-#ifdef CONFIG_SMP
17046- movb ready, %cl
17047 movb $1, ready
17048- cmpb $0,%cl # the first CPU calls start_kernel
17049- je 1f
17050- movl (stack_start), %esp
17051-1:
17052-#endif /* CONFIG_SMP */
17053 jmp *(initial_code)
17054
17055 /*
17056@@ -546,22 +631,22 @@ early_page_fault:
17057 jmp early_fault
17058
17059 early_fault:
17060- cld
17061 #ifdef CONFIG_PRINTK
17062+ cmpl $1,%ss:early_recursion_flag
17063+ je hlt_loop
17064+ incl %ss:early_recursion_flag
17065+ cld
17066 pusha
17067 movl $(__KERNEL_DS),%eax
17068 movl %eax,%ds
17069 movl %eax,%es
17070- cmpl $2,early_recursion_flag
17071- je hlt_loop
17072- incl early_recursion_flag
17073 movl %cr2,%eax
17074 pushl %eax
17075 pushl %edx /* trapno */
17076 pushl $fault_msg
17077 call printk
17078+; call dump_stack
17079 #endif
17080- call dump_stack
17081 hlt_loop:
17082 hlt
17083 jmp hlt_loop
17084@@ -569,8 +654,11 @@ hlt_loop:
17085 /* This is the default interrupt "handler" :-) */
17086 ALIGN
17087 ignore_int:
17088- cld
17089 #ifdef CONFIG_PRINTK
17090+ cmpl $2,%ss:early_recursion_flag
17091+ je hlt_loop
17092+ incl %ss:early_recursion_flag
17093+ cld
17094 pushl %eax
17095 pushl %ecx
17096 pushl %edx
17097@@ -579,9 +667,6 @@ ignore_int:
17098 movl $(__KERNEL_DS),%eax
17099 movl %eax,%ds
17100 movl %eax,%es
17101- cmpl $2,early_recursion_flag
17102- je hlt_loop
17103- incl early_recursion_flag
17104 pushl 16(%esp)
17105 pushl 24(%esp)
17106 pushl 32(%esp)
17107@@ -600,6 +685,8 @@ ignore_int:
17108 #endif
17109 iret
17110
17111+#include "verify_cpu.S"
17112+
17113 __REFDATA
17114 .align 4
17115 ENTRY(initial_code)
17116@@ -610,31 +697,47 @@ ENTRY(initial_page_table)
17117 /*
17118 * BSS section
17119 */
17120-__PAGE_ALIGNED_BSS
17121- .align PAGE_SIZE_asm
17122 #ifdef CONFIG_X86_PAE
17123+.section .swapper_pg_pmd,"a",@progbits
17124 swapper_pg_pmd:
17125 .fill 1024*KPMDS,4,0
17126 #else
17127+.section .swapper_pg_dir,"a",@progbits
17128 ENTRY(swapper_pg_dir)
17129 .fill 1024,4,0
17130 #endif
17131+.section .swapper_pg_fixmap,"a",@progbits
17132 swapper_pg_fixmap:
17133 .fill 1024,4,0
17134 #ifdef CONFIG_X86_TRAMPOLINE
17135+.section .trampoline_pg_dir,"a",@progbits
17136 ENTRY(trampoline_pg_dir)
17137+#ifdef CONFIG_X86_PAE
17138+ .fill 4,8,0
17139+#else
17140 .fill 1024,4,0
17141 #endif
17142+#endif
17143+
17144+.section .empty_zero_page,"a",@progbits
17145 ENTRY(empty_zero_page)
17146 .fill 4096,1,0
17147
17148 /*
17149+ * The IDT has to be page-aligned to simplify the Pentium
17150+ * F0 0F bug workaround.. We have a special link segment
17151+ * for this.
17152+ */
17153+.section .idt,"a",@progbits
17154+ENTRY(idt_table)
17155+ .fill 256,8,0
17156+
17157+/*
17158 * This starts the data section.
17159 */
17160 #ifdef CONFIG_X86_PAE
17161-__PAGE_ALIGNED_DATA
17162- /* Page-aligned for the benefit of paravirt? */
17163- .align PAGE_SIZE_asm
17164+.section .swapper_pg_dir,"a",@progbits
17165+
17166 ENTRY(swapper_pg_dir)
17167 .long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
17168 # if KPMDS == 3
17169@@ -653,15 +756,24 @@ ENTRY(swapper_pg_dir)
17170 # error "Kernel PMDs should be 1, 2 or 3"
17171 # endif
17172 .align PAGE_SIZE_asm /* needs to be page-sized too */
17173+
17174+#ifdef CONFIG_PAX_PER_CPU_PGD
17175+ENTRY(cpu_pgd)
17176+ .rept NR_CPUS
17177+ .fill 4,8,0
17178+ .endr
17179+#endif
17180+
17181 #endif
17182
17183 .data
17184+.balign 4
17185 ENTRY(stack_start)
17186- .long init_thread_union+THREAD_SIZE
17187- .long __BOOT_DS
17188+ .long init_thread_union+THREAD_SIZE-8
17189
17190 ready: .byte 0
17191
17192+.section .rodata,"a",@progbits
17193 early_recursion_flag:
17194 .long 0
17195
17196@@ -697,7 +809,7 @@ fault_msg:
17197 .word 0 # 32 bit align gdt_desc.address
17198 boot_gdt_descr:
17199 .word __BOOT_DS+7
17200- .long boot_gdt - __PAGE_OFFSET
17201+ .long pa(boot_gdt)
17202
17203 .word 0 # 32-bit align idt_desc.address
17204 idt_descr:
17205@@ -708,7 +820,7 @@ idt_descr:
17206 .word 0 # 32 bit align gdt_desc.address
17207 ENTRY(early_gdt_descr)
17208 .word GDT_ENTRIES*8-1
17209- .long per_cpu__gdt_page /* Overwritten for secondary CPUs */
17210+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
17211
17212 /*
17213 * The boot_gdt must mirror the equivalent in setup.S and is
17214@@ -717,5 +829,65 @@ ENTRY(early_gdt_descr)
17215 .align L1_CACHE_BYTES
17216 ENTRY(boot_gdt)
17217 .fill GDT_ENTRY_BOOT_CS,8,0
17218- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
17219- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
17220+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
17221+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
17222+
17223+ .align PAGE_SIZE_asm
17224+ENTRY(cpu_gdt_table)
17225+ .rept NR_CPUS
17226+ .quad 0x0000000000000000 /* NULL descriptor */
17227+ .quad 0x0000000000000000 /* 0x0b reserved */
17228+ .quad 0x0000000000000000 /* 0x13 reserved */
17229+ .quad 0x0000000000000000 /* 0x1b reserved */
17230+
17231+#ifdef CONFIG_PAX_KERNEXEC
17232+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
17233+#else
17234+ .quad 0x0000000000000000 /* 0x20 unused */
17235+#endif
17236+
17237+ .quad 0x0000000000000000 /* 0x28 unused */
17238+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
17239+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
17240+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
17241+ .quad 0x0000000000000000 /* 0x4b reserved */
17242+ .quad 0x0000000000000000 /* 0x53 reserved */
17243+ .quad 0x0000000000000000 /* 0x5b reserved */
17244+
17245+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
17246+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
17247+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
17248+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
17249+
17250+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
17251+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
17252+
17253+ /*
17254+ * Segments used for calling PnP BIOS have byte granularity.
17255+ * The code segments and data segments have fixed 64k limits,
17256+ * the transfer segment sizes are set at run time.
17257+ */
17258+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
17259+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
17260+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
17261+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
17262+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
17263+
17264+ /*
17265+ * The APM segments have byte granularity and their bases
17266+ * are set at run time. All have 64k limits.
17267+ */
17268+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
17269+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
17270+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
17271+
17272+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
17273+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
17274+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
17275+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
17276+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
17277+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
17278+
17279+ /* Be sure this is zeroed to avoid false validations in Xen */
17280+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
17281+ .endr
17282diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
17283index 780cd92..758b2a6 100644
17284--- a/arch/x86/kernel/head_64.S
17285+++ b/arch/x86/kernel/head_64.S
17286@@ -19,6 +19,8 @@
17287 #include <asm/cache.h>
17288 #include <asm/processor-flags.h>
17289 #include <asm/percpu.h>
17290+#include <asm/cpufeature.h>
17291+#include <asm/alternative-asm.h>
17292
17293 #ifdef CONFIG_PARAVIRT
17294 #include <asm/asm-offsets.h>
17295@@ -38,6 +40,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
17296 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
17297 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
17298 L3_START_KERNEL = pud_index(__START_KERNEL_map)
17299+L4_VMALLOC_START = pgd_index(VMALLOC_START)
17300+L3_VMALLOC_START = pud_index(VMALLOC_START)
17301+L4_VMALLOC_END = pgd_index(VMALLOC_END)
17302+L3_VMALLOC_END = pud_index(VMALLOC_END)
17303+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
17304+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
17305
17306 .text
17307 __HEAD
17308@@ -85,35 +93,23 @@ startup_64:
17309 */
17310 addq %rbp, init_level4_pgt + 0(%rip)
17311 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
17312+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
17313+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
17314+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
17315 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
17316
17317 addq %rbp, level3_ident_pgt + 0(%rip)
17318+#ifndef CONFIG_XEN
17319+ addq %rbp, level3_ident_pgt + 8(%rip)
17320+#endif
17321
17322- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
17323- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
17324+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
17325+
17326+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
17327+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
17328
17329 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
17330-
17331- /* Add an Identity mapping if I am above 1G */
17332- leaq _text(%rip), %rdi
17333- andq $PMD_PAGE_MASK, %rdi
17334-
17335- movq %rdi, %rax
17336- shrq $PUD_SHIFT, %rax
17337- andq $(PTRS_PER_PUD - 1), %rax
17338- jz ident_complete
17339-
17340- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
17341- leaq level3_ident_pgt(%rip), %rbx
17342- movq %rdx, 0(%rbx, %rax, 8)
17343-
17344- movq %rdi, %rax
17345- shrq $PMD_SHIFT, %rax
17346- andq $(PTRS_PER_PMD - 1), %rax
17347- leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
17348- leaq level2_spare_pgt(%rip), %rbx
17349- movq %rdx, 0(%rbx, %rax, 8)
17350-ident_complete:
17351+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
17352
17353 /*
17354 * Fixup the kernel text+data virtual addresses. Note that
17355@@ -161,8 +157,8 @@ ENTRY(secondary_startup_64)
17356 * after the boot processor executes this code.
17357 */
17358
17359- /* Enable PAE mode and PGE */
17360- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
17361+ /* Enable PAE mode and PSE/PGE */
17362+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
17363 movq %rax, %cr4
17364
17365 /* Setup early boot stage 4 level pagetables. */
17366@@ -184,9 +180,16 @@ ENTRY(secondary_startup_64)
17367 movl $MSR_EFER, %ecx
17368 rdmsr
17369 btsl $_EFER_SCE, %eax /* Enable System Call */
17370- btl $20,%edi /* No Execute supported? */
17371+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
17372 jnc 1f
17373 btsl $_EFER_NX, %eax
17374+ leaq init_level4_pgt(%rip), %rdi
17375+#ifndef CONFIG_EFI
17376+ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
17377+#endif
17378+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
17379+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
17380+ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
17381 1: wrmsr /* Make changes effective */
17382
17383 /* Setup cr0 */
17384@@ -249,6 +252,7 @@ ENTRY(secondary_startup_64)
17385 * jump. In addition we need to ensure %cs is set so we make this
17386 * a far return.
17387 */
17388+ pax_set_fptr_mask
17389 movq initial_code(%rip),%rax
17390 pushq $0 # fake return address to stop unwinder
17391 pushq $__KERNEL_CS # set correct cs
17392@@ -262,16 +266,16 @@ ENTRY(secondary_startup_64)
17393 .quad x86_64_start_kernel
17394 ENTRY(initial_gs)
17395 .quad INIT_PER_CPU_VAR(irq_stack_union)
17396- __FINITDATA
17397
17398 ENTRY(stack_start)
17399 .quad init_thread_union+THREAD_SIZE-8
17400 .word 0
17401+ __FINITDATA
17402
17403 bad_address:
17404 jmp bad_address
17405
17406- .section ".init.text","ax"
17407+ __INIT
17408 #ifdef CONFIG_EARLY_PRINTK
17409 .globl early_idt_handlers
17410 early_idt_handlers:
17411@@ -316,18 +320,23 @@ ENTRY(early_idt_handler)
17412 #endif /* EARLY_PRINTK */
17413 1: hlt
17414 jmp 1b
17415+ .previous
17416
17417 #ifdef CONFIG_EARLY_PRINTK
17418+ __INITDATA
17419 early_recursion_flag:
17420 .long 0
17421+ .previous
17422
17423+ .section .rodata,"a",@progbits
17424 early_idt_msg:
17425 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
17426 early_idt_ripmsg:
17427 .asciz "RIP %s\n"
17428+ .previous
17429 #endif /* CONFIG_EARLY_PRINTK */
17430- .previous
17431
17432+ .section .rodata,"a",@progbits
17433 #define NEXT_PAGE(name) \
17434 .balign PAGE_SIZE; \
17435 ENTRY(name)
17436@@ -350,13 +359,41 @@ NEXT_PAGE(init_level4_pgt)
17437 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17438 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
17439 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17440+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
17441+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
17442+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
17443+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
17444+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
17445+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
17446 .org init_level4_pgt + L4_START_KERNEL*8, 0
17447 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
17448 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
17449
17450+#ifdef CONFIG_PAX_PER_CPU_PGD
17451+NEXT_PAGE(cpu_pgd)
17452+ .rept NR_CPUS
17453+ .fill 512,8,0
17454+ .endr
17455+#endif
17456+
17457 NEXT_PAGE(level3_ident_pgt)
17458 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17459+#ifdef CONFIG_XEN
17460 .fill 511,8,0
17461+#else
17462+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
17463+ .fill 510,8,0
17464+#endif
17465+
17466+NEXT_PAGE(level3_vmalloc_start_pgt)
17467+ .fill 512,8,0
17468+
17469+NEXT_PAGE(level3_vmalloc_end_pgt)
17470+ .fill 512,8,0
17471+
17472+NEXT_PAGE(level3_vmemmap_pgt)
17473+ .fill L3_VMEMMAP_START,8,0
17474+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
17475
17476 NEXT_PAGE(level3_kernel_pgt)
17477 .fill L3_START_KERNEL,8,0
17478@@ -364,20 +401,23 @@ NEXT_PAGE(level3_kernel_pgt)
17479 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
17480 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
17481
17482+NEXT_PAGE(level2_vmemmap_pgt)
17483+ .fill 512,8,0
17484+
17485 NEXT_PAGE(level2_fixmap_pgt)
17486- .fill 506,8,0
17487- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
17488- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
17489- .fill 5,8,0
17490+ .fill 507,8,0
17491+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
17492+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
17493+ .fill 4,8,0
17494
17495-NEXT_PAGE(level1_fixmap_pgt)
17496+NEXT_PAGE(level1_vsyscall_pgt)
17497 .fill 512,8,0
17498
17499-NEXT_PAGE(level2_ident_pgt)
17500- /* Since I easily can, map the first 1G.
17501+ /* Since I easily can, map the first 2G.
17502 * Don't set NX because code runs from these pages.
17503 */
17504- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
17505+NEXT_PAGE(level2_ident_pgt)
17506+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
17507
17508 NEXT_PAGE(level2_kernel_pgt)
17509 /*
17510@@ -390,33 +430,55 @@ NEXT_PAGE(level2_kernel_pgt)
17511 * If you want to increase this then increase MODULES_VADDR
17512 * too.)
17513 */
17514- PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
17515- KERNEL_IMAGE_SIZE/PMD_SIZE)
17516-
17517-NEXT_PAGE(level2_spare_pgt)
17518- .fill 512, 8, 0
17519+ PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
17520
17521 #undef PMDS
17522 #undef NEXT_PAGE
17523
17524- .data
17525+ .align PAGE_SIZE
17526+ENTRY(cpu_gdt_table)
17527+ .rept NR_CPUS
17528+ .quad 0x0000000000000000 /* NULL descriptor */
17529+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
17530+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
17531+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
17532+ .quad 0x00cffb000000ffff /* __USER32_CS */
17533+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
17534+ .quad 0x00affb000000ffff /* __USER_CS */
17535+
17536+#ifdef CONFIG_PAX_KERNEXEC
17537+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
17538+#else
17539+ .quad 0x0 /* unused */
17540+#endif
17541+
17542+ .quad 0,0 /* TSS */
17543+ .quad 0,0 /* LDT */
17544+ .quad 0,0,0 /* three TLS descriptors */
17545+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
17546+ /* asm/segment.h:GDT_ENTRIES must match this */
17547+
17548+ /* zero the remaining page */
17549+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
17550+ .endr
17551+
17552 .align 16
17553 .globl early_gdt_descr
17554 early_gdt_descr:
17555 .word GDT_ENTRIES*8-1
17556 early_gdt_descr_base:
17557- .quad INIT_PER_CPU_VAR(gdt_page)
17558+ .quad cpu_gdt_table
17559
17560 ENTRY(phys_base)
17561 /* This must match the first entry in level2_kernel_pgt */
17562 .quad 0x0000000000000000
17563
17564 #include "../../x86/xen/xen-head.S"
17565-
17566- .section .bss, "aw", @nobits
17567+
17568+ .section .rodata,"a",@progbits
17569 .align L1_CACHE_BYTES
17570 ENTRY(idt_table)
17571- .skip IDT_ENTRIES * 16
17572+ .fill 512,8,0
17573
17574 __PAGE_ALIGNED_BSS
17575 .align PAGE_SIZE
17576diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
17577index 9c3bd4a..e1d9b35 100644
17578--- a/arch/x86/kernel/i386_ksyms_32.c
17579+++ b/arch/x86/kernel/i386_ksyms_32.c
17580@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
17581 EXPORT_SYMBOL(cmpxchg8b_emu);
17582 #endif
17583
17584+EXPORT_SYMBOL_GPL(cpu_gdt_table);
17585+
17586 /* Networking helper routines. */
17587 EXPORT_SYMBOL(csum_partial_copy_generic);
17588+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
17589+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
17590
17591 EXPORT_SYMBOL(__get_user_1);
17592 EXPORT_SYMBOL(__get_user_2);
17593@@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
17594
17595 EXPORT_SYMBOL(csum_partial);
17596 EXPORT_SYMBOL(empty_zero_page);
17597+
17598+#ifdef CONFIG_PAX_KERNEXEC
17599+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
17600+#endif
17601diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
17602index df89102..a244320 100644
17603--- a/arch/x86/kernel/i8259.c
17604+++ b/arch/x86/kernel/i8259.c
17605@@ -208,7 +208,7 @@ spurious_8259A_irq:
17606 "spurious 8259A interrupt: IRQ%d.\n", irq);
17607 spurious_irq_mask |= irqmask;
17608 }
17609- atomic_inc(&irq_err_count);
17610+ atomic_inc_unchecked(&irq_err_count);
17611 /*
17612 * Theoretically we do not have to handle this IRQ,
17613 * but in Linux this does not cause problems and is
17614diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
17615index 3a54dcb..1c22348 100644
17616--- a/arch/x86/kernel/init_task.c
17617+++ b/arch/x86/kernel/init_task.c
17618@@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
17619 * way process stacks are handled. This is done by having a special
17620 * "init_task" linker map entry..
17621 */
17622-union thread_union init_thread_union __init_task_data =
17623- { INIT_THREAD_INFO(init_task) };
17624+union thread_union init_thread_union __init_task_data;
17625
17626 /*
17627 * Initial task structure.
17628@@ -38,5 +37,5 @@ EXPORT_SYMBOL(init_task);
17629 * section. Since TSS's are completely CPU-local, we want them
17630 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
17631 */
17632-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
17633-
17634+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
17635+EXPORT_SYMBOL(init_tss);
17636diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
17637index 99c4d30..74c84e9 100644
17638--- a/arch/x86/kernel/ioport.c
17639+++ b/arch/x86/kernel/ioport.c
17640@@ -6,6 +6,7 @@
17641 #include <linux/sched.h>
17642 #include <linux/kernel.h>
17643 #include <linux/capability.h>
17644+#include <linux/security.h>
17645 #include <linux/errno.h>
17646 #include <linux/types.h>
17647 #include <linux/ioport.h>
17648@@ -41,6 +42,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17649
17650 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
17651 return -EINVAL;
17652+#ifdef CONFIG_GRKERNSEC_IO
17653+ if (turn_on && grsec_disable_privio) {
17654+ gr_handle_ioperm();
17655+ return -EPERM;
17656+ }
17657+#endif
17658 if (turn_on && !capable(CAP_SYS_RAWIO))
17659 return -EPERM;
17660
17661@@ -67,7 +74,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17662 * because the ->io_bitmap_max value must match the bitmap
17663 * contents:
17664 */
17665- tss = &per_cpu(init_tss, get_cpu());
17666+ tss = init_tss + get_cpu();
17667
17668 set_bitmap(t->io_bitmap_ptr, from, num, !turn_on);
17669
17670@@ -111,6 +118,12 @@ static int do_iopl(unsigned int level, struct pt_regs *regs)
17671 return -EINVAL;
17672 /* Trying to gain more privileges? */
17673 if (level > old) {
17674+#ifdef CONFIG_GRKERNSEC_IO
17675+ if (grsec_disable_privio) {
17676+ gr_handle_iopl();
17677+ return -EPERM;
17678+ }
17679+#endif
17680 if (!capable(CAP_SYS_RAWIO))
17681 return -EPERM;
17682 }
17683diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
17684index 04bbd52..83a07d9 100644
17685--- a/arch/x86/kernel/irq.c
17686+++ b/arch/x86/kernel/irq.c
17687@@ -15,7 +15,7 @@
17688 #include <asm/mce.h>
17689 #include <asm/hw_irq.h>
17690
17691-atomic_t irq_err_count;
17692+atomic_unchecked_t irq_err_count;
17693
17694 /* Function pointer for generic interrupt vector handling */
17695 void (*generic_interrupt_extension)(void) = NULL;
17696@@ -114,9 +114,9 @@ static int show_other_interrupts(struct seq_file *p, int prec)
17697 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
17698 seq_printf(p, " Machine check polls\n");
17699 #endif
17700- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
17701+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
17702 #if defined(CONFIG_X86_IO_APIC)
17703- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
17704+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
17705 #endif
17706 return 0;
17707 }
17708@@ -209,10 +209,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
17709
17710 u64 arch_irq_stat(void)
17711 {
17712- u64 sum = atomic_read(&irq_err_count);
17713+ u64 sum = atomic_read_unchecked(&irq_err_count);
17714
17715 #ifdef CONFIG_X86_IO_APIC
17716- sum += atomic_read(&irq_mis_count);
17717+ sum += atomic_read_unchecked(&irq_mis_count);
17718 #endif
17719 return sum;
17720 }
17721diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
17722index 7d35d0f..03f1d52 100644
17723--- a/arch/x86/kernel/irq_32.c
17724+++ b/arch/x86/kernel/irq_32.c
17725@@ -35,7 +35,7 @@ static int check_stack_overflow(void)
17726 __asm__ __volatile__("andl %%esp,%0" :
17727 "=r" (sp) : "0" (THREAD_SIZE - 1));
17728
17729- return sp < (sizeof(struct thread_info) + STACK_WARN);
17730+ return sp < STACK_WARN;
17731 }
17732
17733 static void print_stack_overflow(void)
17734@@ -54,9 +54,9 @@ static inline void print_stack_overflow(void) { }
17735 * per-CPU IRQ handling contexts (thread information and stack)
17736 */
17737 union irq_ctx {
17738- struct thread_info tinfo;
17739- u32 stack[THREAD_SIZE/sizeof(u32)];
17740-} __attribute__((aligned(PAGE_SIZE)));
17741+ unsigned long previous_esp;
17742+ u32 stack[THREAD_SIZE/sizeof(u32)];
17743+} __attribute__((aligned(THREAD_SIZE)));
17744
17745 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
17746 static DEFINE_PER_CPU(union irq_ctx *, softirq_ctx);
17747@@ -78,10 +78,9 @@ static void call_on_stack(void *func, void *stack)
17748 static inline int
17749 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17750 {
17751- union irq_ctx *curctx, *irqctx;
17752+ union irq_ctx *irqctx;
17753 u32 *isp, arg1, arg2;
17754
17755- curctx = (union irq_ctx *) current_thread_info();
17756 irqctx = __get_cpu_var(hardirq_ctx);
17757
17758 /*
17759@@ -90,21 +89,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17760 * handler) we can't do that and just have to keep using the
17761 * current stack (which is the irq stack already after all)
17762 */
17763- if (unlikely(curctx == irqctx))
17764+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
17765 return 0;
17766
17767 /* build the stack frame on the IRQ stack */
17768- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17769- irqctx->tinfo.task = curctx->tinfo.task;
17770- irqctx->tinfo.previous_esp = current_stack_pointer;
17771+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17772+ irqctx->previous_esp = current_stack_pointer;
17773
17774- /*
17775- * Copy the softirq bits in preempt_count so that the
17776- * softirq checks work in the hardirq context.
17777- */
17778- irqctx->tinfo.preempt_count =
17779- (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
17780- (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
17781+#ifdef CONFIG_PAX_MEMORY_UDEREF
17782+ __set_fs(MAKE_MM_SEG(0));
17783+#endif
17784
17785 if (unlikely(overflow))
17786 call_on_stack(print_stack_overflow, isp);
17787@@ -116,6 +110,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17788 : "0" (irq), "1" (desc), "2" (isp),
17789 "D" (desc->handle_irq)
17790 : "memory", "cc", "ecx");
17791+
17792+#ifdef CONFIG_PAX_MEMORY_UDEREF
17793+ __set_fs(current_thread_info()->addr_limit);
17794+#endif
17795+
17796 return 1;
17797 }
17798
17799@@ -124,28 +123,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17800 */
17801 void __cpuinit irq_ctx_init(int cpu)
17802 {
17803- union irq_ctx *irqctx;
17804-
17805 if (per_cpu(hardirq_ctx, cpu))
17806 return;
17807
17808- irqctx = &per_cpu(hardirq_stack, cpu);
17809- irqctx->tinfo.task = NULL;
17810- irqctx->tinfo.exec_domain = NULL;
17811- irqctx->tinfo.cpu = cpu;
17812- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
17813- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17814-
17815- per_cpu(hardirq_ctx, cpu) = irqctx;
17816-
17817- irqctx = &per_cpu(softirq_stack, cpu);
17818- irqctx->tinfo.task = NULL;
17819- irqctx->tinfo.exec_domain = NULL;
17820- irqctx->tinfo.cpu = cpu;
17821- irqctx->tinfo.preempt_count = 0;
17822- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17823-
17824- per_cpu(softirq_ctx, cpu) = irqctx;
17825+ per_cpu(hardirq_ctx, cpu) = &per_cpu(hardirq_stack, cpu);
17826+ per_cpu(softirq_ctx, cpu) = &per_cpu(softirq_stack, cpu);
17827
17828 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
17829 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
17830@@ -159,7 +141,6 @@ void irq_ctx_exit(int cpu)
17831 asmlinkage void do_softirq(void)
17832 {
17833 unsigned long flags;
17834- struct thread_info *curctx;
17835 union irq_ctx *irqctx;
17836 u32 *isp;
17837
17838@@ -169,15 +150,22 @@ asmlinkage void do_softirq(void)
17839 local_irq_save(flags);
17840
17841 if (local_softirq_pending()) {
17842- curctx = current_thread_info();
17843 irqctx = __get_cpu_var(softirq_ctx);
17844- irqctx->tinfo.task = curctx->task;
17845- irqctx->tinfo.previous_esp = current_stack_pointer;
17846+ irqctx->previous_esp = current_stack_pointer;
17847
17848 /* build the stack frame on the softirq stack */
17849- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17850+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17851+
17852+#ifdef CONFIG_PAX_MEMORY_UDEREF
17853+ __set_fs(MAKE_MM_SEG(0));
17854+#endif
17855
17856 call_on_stack(__do_softirq, isp);
17857+
17858+#ifdef CONFIG_PAX_MEMORY_UDEREF
17859+ __set_fs(current_thread_info()->addr_limit);
17860+#endif
17861+
17862 /*
17863 * Shouldnt happen, we returned above if in_interrupt():
17864 */
17865diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
17866index 8d82a77..0baf312 100644
17867--- a/arch/x86/kernel/kgdb.c
17868+++ b/arch/x86/kernel/kgdb.c
17869@@ -390,13 +390,13 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
17870
17871 /* clear the trace bit */
17872 linux_regs->flags &= ~X86_EFLAGS_TF;
17873- atomic_set(&kgdb_cpu_doing_single_step, -1);
17874+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
17875
17876 /* set the trace bit if we're stepping */
17877 if (remcomInBuffer[0] == 's') {
17878 linux_regs->flags |= X86_EFLAGS_TF;
17879 kgdb_single_step = 1;
17880- atomic_set(&kgdb_cpu_doing_single_step,
17881+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
17882 raw_smp_processor_id());
17883 }
17884
17885@@ -476,7 +476,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
17886 break;
17887
17888 case DIE_DEBUG:
17889- if (atomic_read(&kgdb_cpu_doing_single_step) ==
17890+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) ==
17891 raw_smp_processor_id()) {
17892 if (user_mode(regs))
17893 return single_step_cont(regs, args);
17894@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs)
17895 return instruction_pointer(regs);
17896 }
17897
17898-struct kgdb_arch arch_kgdb_ops = {
17899+const struct kgdb_arch arch_kgdb_ops = {
17900 /* Breakpoint instruction: */
17901 .gdb_bpt_instr = { 0xcc },
17902 .flags = KGDB_HW_BREAKPOINT,
17903diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
17904index 7a67820..8d15b75 100644
17905--- a/arch/x86/kernel/kprobes.c
17906+++ b/arch/x86/kernel/kprobes.c
17907@@ -168,9 +168,13 @@ static void __kprobes set_jmp_op(void *from, void *to)
17908 char op;
17909 s32 raddr;
17910 } __attribute__((packed)) * jop;
17911- jop = (struct __arch_jmp_op *)from;
17912+
17913+ jop = (struct __arch_jmp_op *)(ktla_ktva(from));
17914+
17915+ pax_open_kernel();
17916 jop->raddr = (s32)((long)(to) - ((long)(from) + 5));
17917 jop->op = RELATIVEJUMP_INSTRUCTION;
17918+ pax_close_kernel();
17919 }
17920
17921 /*
17922@@ -195,7 +199,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
17923 kprobe_opcode_t opcode;
17924 kprobe_opcode_t *orig_opcodes = opcodes;
17925
17926- if (search_exception_tables((unsigned long)opcodes))
17927+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
17928 return 0; /* Page fault may occur on this address. */
17929
17930 retry:
17931@@ -339,7 +343,9 @@ static void __kprobes fix_riprel(struct kprobe *p)
17932 disp = (u8 *) p->addr + *((s32 *) insn) -
17933 (u8 *) p->ainsn.insn;
17934 BUG_ON((s64) (s32) disp != disp); /* Sanity check. */
17935+ pax_open_kernel();
17936 *(s32 *)insn = (s32) disp;
17937+ pax_close_kernel();
17938 }
17939 }
17940 #endif
17941@@ -347,16 +353,18 @@ static void __kprobes fix_riprel(struct kprobe *p)
17942
17943 static void __kprobes arch_copy_kprobe(struct kprobe *p)
17944 {
17945- memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
17946+ pax_open_kernel();
17947+ memcpy(p->ainsn.insn, ktla_ktva(p->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
17948+ pax_close_kernel();
17949
17950 fix_riprel(p);
17951
17952- if (can_boost(p->addr))
17953+ if (can_boost(ktla_ktva(p->addr)))
17954 p->ainsn.boostable = 0;
17955 else
17956 p->ainsn.boostable = -1;
17957
17958- p->opcode = *p->addr;
17959+ p->opcode = *(ktla_ktva(p->addr));
17960 }
17961
17962 int __kprobes arch_prepare_kprobe(struct kprobe *p)
17963@@ -434,7 +442,7 @@ static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
17964 if (p->opcode == BREAKPOINT_INSTRUCTION)
17965 regs->ip = (unsigned long)p->addr;
17966 else
17967- regs->ip = (unsigned long)p->ainsn.insn;
17968+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17969 }
17970
17971 void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
17972@@ -455,7 +463,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17973 if (p->ainsn.boostable == 1 && !p->post_handler) {
17974 /* Boost up -- we can execute copied instructions directly */
17975 reset_current_kprobe();
17976- regs->ip = (unsigned long)p->ainsn.insn;
17977+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17978 preempt_enable_no_resched();
17979 return;
17980 }
17981@@ -525,7 +533,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
17982 struct kprobe_ctlblk *kcb;
17983
17984 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
17985- if (*addr != BREAKPOINT_INSTRUCTION) {
17986+ if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
17987 /*
17988 * The breakpoint instruction was removed right
17989 * after we hit it. Another cpu has removed
17990@@ -637,6 +645,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
17991 /* Skip orig_ax, ip, cs */
17992 " addq $24, %rsp\n"
17993 " popfq\n"
17994+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
17995+ " btsq $63,(%rsp)\n"
17996+#endif
17997 #else
17998 " pushf\n"
17999 /*
18000@@ -777,7 +788,7 @@ static void __kprobes resume_execution(struct kprobe *p,
18001 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
18002 {
18003 unsigned long *tos = stack_addr(regs);
18004- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
18005+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
18006 unsigned long orig_ip = (unsigned long)p->addr;
18007 kprobe_opcode_t *insn = p->ainsn.insn;
18008
18009@@ -960,7 +971,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
18010 struct die_args *args = data;
18011 int ret = NOTIFY_DONE;
18012
18013- if (args->regs && user_mode_vm(args->regs))
18014+ if (args->regs && user_mode(args->regs))
18015 return ret;
18016
18017 switch (val) {
18018diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
18019index 63b0ec8..6d92227 100644
18020--- a/arch/x86/kernel/kvm.c
18021+++ b/arch/x86/kernel/kvm.c
18022@@ -216,6 +216,7 @@ static void __init paravirt_ops_setup(void)
18023 pv_mmu_ops.set_pud = kvm_set_pud;
18024 #if PAGETABLE_LEVELS == 4
18025 pv_mmu_ops.set_pgd = kvm_set_pgd;
18026+ pv_mmu_ops.set_pgd_batched = kvm_set_pgd;
18027 #endif
18028 #endif
18029 pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
18030diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
18031index ec6ef60..ab2c824 100644
18032--- a/arch/x86/kernel/ldt.c
18033+++ b/arch/x86/kernel/ldt.c
18034@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
18035 if (reload) {
18036 #ifdef CONFIG_SMP
18037 preempt_disable();
18038- load_LDT(pc);
18039+ load_LDT_nolock(pc);
18040 if (!cpumask_equal(mm_cpumask(current->mm),
18041 cpumask_of(smp_processor_id())))
18042 smp_call_function(flush_ldt, current->mm, 1);
18043 preempt_enable();
18044 #else
18045- load_LDT(pc);
18046+ load_LDT_nolock(pc);
18047 #endif
18048 }
18049 if (oldsize) {
18050@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
18051 return err;
18052
18053 for (i = 0; i < old->size; i++)
18054- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
18055+ write_ldt_entry(new->ldt, i, old->ldt + i);
18056 return 0;
18057 }
18058
18059@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
18060 retval = copy_ldt(&mm->context, &old_mm->context);
18061 mutex_unlock(&old_mm->context.lock);
18062 }
18063+
18064+ if (tsk == current) {
18065+ mm->context.vdso = 0;
18066+
18067+#ifdef CONFIG_X86_32
18068+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
18069+ mm->context.user_cs_base = 0UL;
18070+ mm->context.user_cs_limit = ~0UL;
18071+
18072+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
18073+ cpus_clear(mm->context.cpu_user_cs_mask);
18074+#endif
18075+
18076+#endif
18077+#endif
18078+
18079+ }
18080+
18081 return retval;
18082 }
18083
18084@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
18085 }
18086 }
18087
18088+#ifdef CONFIG_PAX_SEGMEXEC
18089+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
18090+ error = -EINVAL;
18091+ goto out_unlock;
18092+ }
18093+#endif
18094+
18095 fill_ldt(&ldt, &ldt_info);
18096 if (oldmode)
18097 ldt.avl = 0;
18098diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
18099index c1c429d..f02eaf9 100644
18100--- a/arch/x86/kernel/machine_kexec_32.c
18101+++ b/arch/x86/kernel/machine_kexec_32.c
18102@@ -26,7 +26,7 @@
18103 #include <asm/system.h>
18104 #include <asm/cacheflush.h>
18105
18106-static void set_idt(void *newidt, __u16 limit)
18107+static void set_idt(struct desc_struct *newidt, __u16 limit)
18108 {
18109 struct desc_ptr curidt;
18110
18111@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
18112 }
18113
18114
18115-static void set_gdt(void *newgdt, __u16 limit)
18116+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
18117 {
18118 struct desc_ptr curgdt;
18119
18120@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image)
18121 }
18122
18123 control_page = page_address(image->control_code_page);
18124- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
18125+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
18126
18127 relocate_kernel_ptr = control_page;
18128 page_list[PA_CONTROL_PAGE] = __pa(control_page);
18129diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
18130index 1e47679..e73449d 100644
18131--- a/arch/x86/kernel/microcode_amd.c
18132+++ b/arch/x86/kernel/microcode_amd.c
18133@@ -364,7 +364,7 @@ static void microcode_fini_cpu_amd(int cpu)
18134 uci->mc = NULL;
18135 }
18136
18137-static struct microcode_ops microcode_amd_ops = {
18138+static const struct microcode_ops microcode_amd_ops = {
18139 .request_microcode_user = request_microcode_user,
18140 .request_microcode_fw = request_microcode_fw,
18141 .collect_cpu_info = collect_cpu_info_amd,
18142@@ -372,7 +372,7 @@ static struct microcode_ops microcode_amd_ops = {
18143 .microcode_fini_cpu = microcode_fini_cpu_amd,
18144 };
18145
18146-struct microcode_ops * __init init_amd_microcode(void)
18147+const struct microcode_ops * __init init_amd_microcode(void)
18148 {
18149 return &microcode_amd_ops;
18150 }
18151diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
18152index 378e9a8..b5a6ea9 100644
18153--- a/arch/x86/kernel/microcode_core.c
18154+++ b/arch/x86/kernel/microcode_core.c
18155@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
18156
18157 #define MICROCODE_VERSION "2.00"
18158
18159-static struct microcode_ops *microcode_ops;
18160+static const struct microcode_ops *microcode_ops;
18161
18162 /*
18163 * Synchronization.
18164diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
18165index 0d334dd..14cedaf 100644
18166--- a/arch/x86/kernel/microcode_intel.c
18167+++ b/arch/x86/kernel/microcode_intel.c
18168@@ -443,13 +443,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
18169
18170 static int get_ucode_user(void *to, const void *from, size_t n)
18171 {
18172- return copy_from_user(to, from, n);
18173+ return copy_from_user(to, (const void __force_user *)from, n);
18174 }
18175
18176 static enum ucode_state
18177 request_microcode_user(int cpu, const void __user *buf, size_t size)
18178 {
18179- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
18180+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
18181 }
18182
18183 static void microcode_fini_cpu(int cpu)
18184@@ -460,7 +460,7 @@ static void microcode_fini_cpu(int cpu)
18185 uci->mc = NULL;
18186 }
18187
18188-static struct microcode_ops microcode_intel_ops = {
18189+static const struct microcode_ops microcode_intel_ops = {
18190 .request_microcode_user = request_microcode_user,
18191 .request_microcode_fw = request_microcode_fw,
18192 .collect_cpu_info = collect_cpu_info,
18193@@ -468,7 +468,7 @@ static struct microcode_ops microcode_intel_ops = {
18194 .microcode_fini_cpu = microcode_fini_cpu,
18195 };
18196
18197-struct microcode_ops * __init init_intel_microcode(void)
18198+const struct microcode_ops * __init init_intel_microcode(void)
18199 {
18200 return &microcode_intel_ops;
18201 }
18202diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
18203index 89f386f..9028f51 100644
18204--- a/arch/x86/kernel/module.c
18205+++ b/arch/x86/kernel/module.c
18206@@ -34,7 +34,7 @@
18207 #define DEBUGP(fmt...)
18208 #endif
18209
18210-void *module_alloc(unsigned long size)
18211+static void *__module_alloc(unsigned long size, pgprot_t prot)
18212 {
18213 struct vm_struct *area;
18214
18215@@ -48,8 +48,18 @@ void *module_alloc(unsigned long size)
18216 if (!area)
18217 return NULL;
18218
18219- return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM,
18220- PAGE_KERNEL_EXEC);
18221+ return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot);
18222+}
18223+
18224+void *module_alloc(unsigned long size)
18225+{
18226+
18227+#ifdef CONFIG_PAX_KERNEXEC
18228+ return __module_alloc(size, PAGE_KERNEL);
18229+#else
18230+ return __module_alloc(size, PAGE_KERNEL_EXEC);
18231+#endif
18232+
18233 }
18234
18235 /* Free memory returned from module_alloc */
18236@@ -58,6 +68,40 @@ void module_free(struct module *mod, void *module_region)
18237 vfree(module_region);
18238 }
18239
18240+#ifdef CONFIG_PAX_KERNEXEC
18241+#ifdef CONFIG_X86_32
18242+void *module_alloc_exec(unsigned long size)
18243+{
18244+ struct vm_struct *area;
18245+
18246+ if (size == 0)
18247+ return NULL;
18248+
18249+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
18250+ return area ? area->addr : NULL;
18251+}
18252+EXPORT_SYMBOL(module_alloc_exec);
18253+
18254+void module_free_exec(struct module *mod, void *module_region)
18255+{
18256+ vunmap(module_region);
18257+}
18258+EXPORT_SYMBOL(module_free_exec);
18259+#else
18260+void module_free_exec(struct module *mod, void *module_region)
18261+{
18262+ module_free(mod, module_region);
18263+}
18264+EXPORT_SYMBOL(module_free_exec);
18265+
18266+void *module_alloc_exec(unsigned long size)
18267+{
18268+ return __module_alloc(size, PAGE_KERNEL_RX);
18269+}
18270+EXPORT_SYMBOL(module_alloc_exec);
18271+#endif
18272+#endif
18273+
18274 /* We don't need anything special. */
18275 int module_frob_arch_sections(Elf_Ehdr *hdr,
18276 Elf_Shdr *sechdrs,
18277@@ -77,14 +121,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
18278 unsigned int i;
18279 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
18280 Elf32_Sym *sym;
18281- uint32_t *location;
18282+ uint32_t *plocation, location;
18283
18284 DEBUGP("Applying relocate section %u to %u\n", relsec,
18285 sechdrs[relsec].sh_info);
18286 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
18287 /* This is where to make the change */
18288- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
18289- + rel[i].r_offset;
18290+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
18291+ location = (uint32_t)plocation;
18292+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
18293+ plocation = ktla_ktva((void *)plocation);
18294 /* This is the symbol it is referring to. Note that all
18295 undefined symbols have been resolved. */
18296 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
18297@@ -93,11 +139,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
18298 switch (ELF32_R_TYPE(rel[i].r_info)) {
18299 case R_386_32:
18300 /* We add the value into the location given */
18301- *location += sym->st_value;
18302+ pax_open_kernel();
18303+ *plocation += sym->st_value;
18304+ pax_close_kernel();
18305 break;
18306 case R_386_PC32:
18307 /* Add the value, subtract its postition */
18308- *location += sym->st_value - (uint32_t)location;
18309+ pax_open_kernel();
18310+ *plocation += sym->st_value - location;
18311+ pax_close_kernel();
18312 break;
18313 default:
18314 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
18315@@ -153,21 +203,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
18316 case R_X86_64_NONE:
18317 break;
18318 case R_X86_64_64:
18319+ pax_open_kernel();
18320 *(u64 *)loc = val;
18321+ pax_close_kernel();
18322 break;
18323 case R_X86_64_32:
18324+ pax_open_kernel();
18325 *(u32 *)loc = val;
18326+ pax_close_kernel();
18327 if (val != *(u32 *)loc)
18328 goto overflow;
18329 break;
18330 case R_X86_64_32S:
18331+ pax_open_kernel();
18332 *(s32 *)loc = val;
18333+ pax_close_kernel();
18334 if ((s64)val != *(s32 *)loc)
18335 goto overflow;
18336 break;
18337 case R_X86_64_PC32:
18338 val -= (u64)loc;
18339+ pax_open_kernel();
18340 *(u32 *)loc = val;
18341+ pax_close_kernel();
18342+
18343 #if 0
18344 if ((s64)val != *(s32 *)loc)
18345 goto overflow;
18346diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
18347index 3a7c5a4..9191528 100644
18348--- a/arch/x86/kernel/paravirt-spinlocks.c
18349+++ b/arch/x86/kernel/paravirt-spinlocks.c
18350@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
18351 __raw_spin_lock(lock);
18352 }
18353
18354-struct pv_lock_ops pv_lock_ops = {
18355+struct pv_lock_ops pv_lock_ops __read_only = {
18356 #ifdef CONFIG_SMP
18357 .spin_is_locked = __ticket_spin_is_locked,
18358 .spin_is_contended = __ticket_spin_is_contended,
18359diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
18360index 1b1739d..dea6077 100644
18361--- a/arch/x86/kernel/paravirt.c
18362+++ b/arch/x86/kernel/paravirt.c
18363@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
18364 {
18365 return x;
18366 }
18367+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
18368+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
18369+#endif
18370
18371 void __init default_banner(void)
18372 {
18373@@ -122,7 +125,7 @@ unsigned paravirt_patch_jmp(void *insnbuf, const void *target,
18374 * corresponding structure. */
18375 static void *get_call_destination(u8 type)
18376 {
18377- struct paravirt_patch_template tmpl = {
18378+ const struct paravirt_patch_template tmpl = {
18379 .pv_init_ops = pv_init_ops,
18380 .pv_time_ops = pv_time_ops,
18381 .pv_cpu_ops = pv_cpu_ops,
18382@@ -133,6 +136,8 @@ static void *get_call_destination(u8 type)
18383 .pv_lock_ops = pv_lock_ops,
18384 #endif
18385 };
18386+
18387+ pax_track_stack();
18388 return *((void **)&tmpl + type);
18389 }
18390
18391@@ -145,15 +150,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
18392 if (opfunc == NULL)
18393 /* If there's no function, patch it with a ud2a (BUG) */
18394 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
18395- else if (opfunc == _paravirt_nop)
18396+ else if (opfunc == (void *)_paravirt_nop)
18397 /* If the operation is a nop, then nop the callsite */
18398 ret = paravirt_patch_nop();
18399
18400 /* identity functions just return their single argument */
18401- else if (opfunc == _paravirt_ident_32)
18402+ else if (opfunc == (void *)_paravirt_ident_32)
18403 ret = paravirt_patch_ident_32(insnbuf, len);
18404- else if (opfunc == _paravirt_ident_64)
18405+ else if (opfunc == (void *)_paravirt_ident_64)
18406 ret = paravirt_patch_ident_64(insnbuf, len);
18407+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
18408+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
18409+ ret = paravirt_patch_ident_64(insnbuf, len);
18410+#endif
18411
18412 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
18413 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
18414@@ -178,7 +187,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
18415 if (insn_len > len || start == NULL)
18416 insn_len = len;
18417 else
18418- memcpy(insnbuf, start, insn_len);
18419+ memcpy(insnbuf, ktla_ktva(start), insn_len);
18420
18421 return insn_len;
18422 }
18423@@ -294,22 +303,22 @@ void arch_flush_lazy_mmu_mode(void)
18424 preempt_enable();
18425 }
18426
18427-struct pv_info pv_info = {
18428+struct pv_info pv_info __read_only = {
18429 .name = "bare hardware",
18430 .paravirt_enabled = 0,
18431 .kernel_rpl = 0,
18432 .shared_kernel_pmd = 1, /* Only used when CONFIG_X86_PAE is set */
18433 };
18434
18435-struct pv_init_ops pv_init_ops = {
18436+struct pv_init_ops pv_init_ops __read_only = {
18437 .patch = native_patch,
18438 };
18439
18440-struct pv_time_ops pv_time_ops = {
18441+struct pv_time_ops pv_time_ops __read_only = {
18442 .sched_clock = native_sched_clock,
18443 };
18444
18445-struct pv_irq_ops pv_irq_ops = {
18446+struct pv_irq_ops pv_irq_ops __read_only = {
18447 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
18448 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
18449 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
18450@@ -321,7 +330,7 @@ struct pv_irq_ops pv_irq_ops = {
18451 #endif
18452 };
18453
18454-struct pv_cpu_ops pv_cpu_ops = {
18455+struct pv_cpu_ops pv_cpu_ops __read_only = {
18456 .cpuid = native_cpuid,
18457 .get_debugreg = native_get_debugreg,
18458 .set_debugreg = native_set_debugreg,
18459@@ -382,21 +391,26 @@ struct pv_cpu_ops pv_cpu_ops = {
18460 .end_context_switch = paravirt_nop,
18461 };
18462
18463-struct pv_apic_ops pv_apic_ops = {
18464+struct pv_apic_ops pv_apic_ops __read_only = {
18465 #ifdef CONFIG_X86_LOCAL_APIC
18466 .startup_ipi_hook = paravirt_nop,
18467 #endif
18468 };
18469
18470-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
18471+#ifdef CONFIG_X86_32
18472+#ifdef CONFIG_X86_PAE
18473+/* 64-bit pagetable entries */
18474+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
18475+#else
18476 /* 32-bit pagetable entries */
18477 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
18478+#endif
18479 #else
18480 /* 64-bit pagetable entries */
18481 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
18482 #endif
18483
18484-struct pv_mmu_ops pv_mmu_ops = {
18485+struct pv_mmu_ops pv_mmu_ops __read_only = {
18486
18487 .read_cr2 = native_read_cr2,
18488 .write_cr2 = native_write_cr2,
18489@@ -448,6 +462,7 @@ struct pv_mmu_ops pv_mmu_ops = {
18490 .make_pud = PTE_IDENT,
18491
18492 .set_pgd = native_set_pgd,
18493+ .set_pgd_batched = native_set_pgd_batched,
18494 #endif
18495 #endif /* PAGETABLE_LEVELS >= 3 */
18496
18497@@ -467,6 +482,12 @@ struct pv_mmu_ops pv_mmu_ops = {
18498 },
18499
18500 .set_fixmap = native_set_fixmap,
18501+
18502+#ifdef CONFIG_PAX_KERNEXEC
18503+ .pax_open_kernel = native_pax_open_kernel,
18504+ .pax_close_kernel = native_pax_close_kernel,
18505+#endif
18506+
18507 };
18508
18509 EXPORT_SYMBOL_GPL(pv_time_ops);
18510diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
18511index 1a2d4b1..6a0dd55 100644
18512--- a/arch/x86/kernel/pci-calgary_64.c
18513+++ b/arch/x86/kernel/pci-calgary_64.c
18514@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct device *dev, size_t size,
18515 free_pages((unsigned long)vaddr, get_order(size));
18516 }
18517
18518-static struct dma_map_ops calgary_dma_ops = {
18519+static const struct dma_map_ops calgary_dma_ops = {
18520 .alloc_coherent = calgary_alloc_coherent,
18521 .free_coherent = calgary_free_coherent,
18522 .map_sg = calgary_map_sg,
18523diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
18524index 6ac3931..42b4414 100644
18525--- a/arch/x86/kernel/pci-dma.c
18526+++ b/arch/x86/kernel/pci-dma.c
18527@@ -14,7 +14,7 @@
18528
18529 static int forbid_dac __read_mostly;
18530
18531-struct dma_map_ops *dma_ops;
18532+const struct dma_map_ops *dma_ops;
18533 EXPORT_SYMBOL(dma_ops);
18534
18535 static int iommu_sac_force __read_mostly;
18536@@ -243,7 +243,7 @@ early_param("iommu", iommu_setup);
18537
18538 int dma_supported(struct device *dev, u64 mask)
18539 {
18540- struct dma_map_ops *ops = get_dma_ops(dev);
18541+ const struct dma_map_ops *ops = get_dma_ops(dev);
18542
18543 #ifdef CONFIG_PCI
18544 if (mask > 0xffffffff && forbid_dac > 0) {
18545diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
18546index 1c76691..e3632db 100644
18547--- a/arch/x86/kernel/pci-gart_64.c
18548+++ b/arch/x86/kernel/pci-gart_64.c
18549@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct agp_kern_info *info)
18550 return -1;
18551 }
18552
18553-static struct dma_map_ops gart_dma_ops = {
18554+static const struct dma_map_ops gart_dma_ops = {
18555 .map_sg = gart_map_sg,
18556 .unmap_sg = gart_unmap_sg,
18557 .map_page = gart_map_page,
18558diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
18559index a3933d4..c898869 100644
18560--- a/arch/x86/kernel/pci-nommu.c
18561+++ b/arch/x86/kernel/pci-nommu.c
18562@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(struct device *dev,
18563 flush_write_buffers();
18564 }
18565
18566-struct dma_map_ops nommu_dma_ops = {
18567+const struct dma_map_ops nommu_dma_ops = {
18568 .alloc_coherent = dma_generic_alloc_coherent,
18569 .free_coherent = nommu_free_coherent,
18570 .map_sg = nommu_map_sg,
18571diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
18572index aaa6b78..4de1881 100644
18573--- a/arch/x86/kernel/pci-swiotlb.c
18574+++ b/arch/x86/kernel/pci-swiotlb.c
18575@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
18576 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
18577 }
18578
18579-static struct dma_map_ops swiotlb_dma_ops = {
18580+static const struct dma_map_ops swiotlb_dma_ops = {
18581 .mapping_error = swiotlb_dma_mapping_error,
18582 .alloc_coherent = x86_swiotlb_alloc_coherent,
18583 .free_coherent = swiotlb_free_coherent,
18584diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
18585index fc6c84d..0312ca2 100644
18586--- a/arch/x86/kernel/process.c
18587+++ b/arch/x86/kernel/process.c
18588@@ -51,16 +51,33 @@ void free_thread_xstate(struct task_struct *tsk)
18589
18590 void free_thread_info(struct thread_info *ti)
18591 {
18592- free_thread_xstate(ti->task);
18593 free_pages((unsigned long)ti, get_order(THREAD_SIZE));
18594 }
18595
18596+static struct kmem_cache *task_struct_cachep;
18597+
18598 void arch_task_cache_init(void)
18599 {
18600- task_xstate_cachep =
18601- kmem_cache_create("task_xstate", xstate_size,
18602+ /* create a slab on which task_structs can be allocated */
18603+ task_struct_cachep =
18604+ kmem_cache_create("task_struct", sizeof(struct task_struct),
18605+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
18606+
18607+ task_xstate_cachep =
18608+ kmem_cache_create("task_xstate", xstate_size,
18609 __alignof__(union thread_xstate),
18610- SLAB_PANIC | SLAB_NOTRACK, NULL);
18611+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
18612+}
18613+
18614+struct task_struct *alloc_task_struct(void)
18615+{
18616+ return kmem_cache_alloc(task_struct_cachep, GFP_KERNEL);
18617+}
18618+
18619+void free_task_struct(struct task_struct *task)
18620+{
18621+ free_thread_xstate(task);
18622+ kmem_cache_free(task_struct_cachep, task);
18623 }
18624
18625 /*
18626@@ -73,7 +90,7 @@ void exit_thread(void)
18627 unsigned long *bp = t->io_bitmap_ptr;
18628
18629 if (bp) {
18630- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
18631+ struct tss_struct *tss = init_tss + get_cpu();
18632
18633 t->io_bitmap_ptr = NULL;
18634 clear_thread_flag(TIF_IO_BITMAP);
18635@@ -93,6 +110,9 @@ void flush_thread(void)
18636
18637 clear_tsk_thread_flag(tsk, TIF_DEBUG);
18638
18639+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18640+ loadsegment(gs, 0);
18641+#endif
18642 tsk->thread.debugreg0 = 0;
18643 tsk->thread.debugreg1 = 0;
18644 tsk->thread.debugreg2 = 0;
18645@@ -307,7 +327,7 @@ void default_idle(void)
18646 EXPORT_SYMBOL(default_idle);
18647 #endif
18648
18649-void stop_this_cpu(void *dummy)
18650+__noreturn void stop_this_cpu(void *dummy)
18651 {
18652 local_irq_disable();
18653 /*
18654@@ -568,16 +588,38 @@ static int __init idle_setup(char *str)
18655 }
18656 early_param("idle", idle_setup);
18657
18658-unsigned long arch_align_stack(unsigned long sp)
18659+#ifdef CONFIG_PAX_RANDKSTACK
18660+void pax_randomize_kstack(struct pt_regs *regs)
18661 {
18662- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
18663- sp -= get_random_int() % 8192;
18664- return sp & ~0xf;
18665-}
18666+ struct thread_struct *thread = &current->thread;
18667+ unsigned long time;
18668
18669-unsigned long arch_randomize_brk(struct mm_struct *mm)
18670-{
18671- unsigned long range_end = mm->brk + 0x02000000;
18672- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
18673+ if (!randomize_va_space)
18674+ return;
18675+
18676+ if (v8086_mode(regs))
18677+ return;
18678+
18679+ rdtscl(time);
18680+
18681+ /* P4 seems to return a 0 LSB, ignore it */
18682+#ifdef CONFIG_MPENTIUM4
18683+ time &= 0x3EUL;
18684+ time <<= 2;
18685+#elif defined(CONFIG_X86_64)
18686+ time &= 0xFUL;
18687+ time <<= 4;
18688+#else
18689+ time &= 0x1FUL;
18690+ time <<= 3;
18691+#endif
18692+
18693+ thread->sp0 ^= time;
18694+ load_sp0(init_tss + smp_processor_id(), thread);
18695+
18696+#ifdef CONFIG_X86_64
18697+ percpu_write(kernel_stack, thread->sp0);
18698+#endif
18699 }
18700+#endif
18701
18702diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
18703index c40c432..6e1df72 100644
18704--- a/arch/x86/kernel/process_32.c
18705+++ b/arch/x86/kernel/process_32.c
18706@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
18707 unsigned long thread_saved_pc(struct task_struct *tsk)
18708 {
18709 return ((unsigned long *)tsk->thread.sp)[3];
18710+//XXX return tsk->thread.eip;
18711 }
18712
18713 #ifndef CONFIG_SMP
18714@@ -129,15 +130,14 @@ void __show_regs(struct pt_regs *regs, int all)
18715 unsigned short ss, gs;
18716 const char *board;
18717
18718- if (user_mode_vm(regs)) {
18719+ if (user_mode(regs)) {
18720 sp = regs->sp;
18721 ss = regs->ss & 0xffff;
18722- gs = get_user_gs(regs);
18723 } else {
18724 sp = (unsigned long) (&regs->sp);
18725 savesegment(ss, ss);
18726- savesegment(gs, gs);
18727 }
18728+ gs = get_user_gs(regs);
18729
18730 printk("\n");
18731
18732@@ -210,10 +210,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
18733 regs.bx = (unsigned long) fn;
18734 regs.dx = (unsigned long) arg;
18735
18736- regs.ds = __USER_DS;
18737- regs.es = __USER_DS;
18738+ regs.ds = __KERNEL_DS;
18739+ regs.es = __KERNEL_DS;
18740 regs.fs = __KERNEL_PERCPU;
18741- regs.gs = __KERNEL_STACK_CANARY;
18742+ savesegment(gs, regs.gs);
18743 regs.orig_ax = -1;
18744 regs.ip = (unsigned long) kernel_thread_helper;
18745 regs.cs = __KERNEL_CS | get_kernel_rpl();
18746@@ -247,13 +247,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18747 struct task_struct *tsk;
18748 int err;
18749
18750- childregs = task_pt_regs(p);
18751+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
18752 *childregs = *regs;
18753 childregs->ax = 0;
18754 childregs->sp = sp;
18755
18756 p->thread.sp = (unsigned long) childregs;
18757 p->thread.sp0 = (unsigned long) (childregs+1);
18758+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18759
18760 p->thread.ip = (unsigned long) ret_from_fork;
18761
18762@@ -345,7 +346,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18763 struct thread_struct *prev = &prev_p->thread,
18764 *next = &next_p->thread;
18765 int cpu = smp_processor_id();
18766- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18767+ struct tss_struct *tss = init_tss + cpu;
18768 bool preload_fpu;
18769
18770 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
18771@@ -380,6 +381,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18772 */
18773 lazy_save_gs(prev->gs);
18774
18775+#ifdef CONFIG_PAX_MEMORY_UDEREF
18776+ __set_fs(task_thread_info(next_p)->addr_limit);
18777+#endif
18778+
18779 /*
18780 * Load the per-thread Thread-Local Storage descriptor.
18781 */
18782@@ -415,6 +420,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18783 */
18784 arch_end_context_switch(next_p);
18785
18786+ percpu_write(current_task, next_p);
18787+ percpu_write(current_tinfo, &next_p->tinfo);
18788+
18789 if (preload_fpu)
18790 __math_state_restore();
18791
18792@@ -424,8 +432,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18793 if (prev->gs | next->gs)
18794 lazy_load_gs(next->gs);
18795
18796- percpu_write(current_task, next_p);
18797-
18798 return prev_p;
18799 }
18800
18801@@ -495,4 +501,3 @@ unsigned long get_wchan(struct task_struct *p)
18802 } while (count++ < 16);
18803 return 0;
18804 }
18805-
18806diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
18807index 39493bc..196816d 100644
18808--- a/arch/x86/kernel/process_64.c
18809+++ b/arch/x86/kernel/process_64.c
18810@@ -91,7 +91,7 @@ static void __exit_idle(void)
18811 void exit_idle(void)
18812 {
18813 /* idle loop has pid 0 */
18814- if (current->pid)
18815+ if (task_pid_nr(current))
18816 return;
18817 __exit_idle();
18818 }
18819@@ -170,7 +170,7 @@ void __show_regs(struct pt_regs *regs, int all)
18820 if (!board)
18821 board = "";
18822 printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",
18823- current->pid, current->comm, print_tainted(),
18824+ task_pid_nr(current), current->comm, print_tainted(),
18825 init_utsname()->release,
18826 (int)strcspn(init_utsname()->version, " "),
18827 init_utsname()->version, board);
18828@@ -280,8 +280,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18829 struct pt_regs *childregs;
18830 struct task_struct *me = current;
18831
18832- childregs = ((struct pt_regs *)
18833- (THREAD_SIZE + task_stack_page(p))) - 1;
18834+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
18835 *childregs = *regs;
18836
18837 childregs->ax = 0;
18838@@ -292,6 +291,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18839 p->thread.sp = (unsigned long) childregs;
18840 p->thread.sp0 = (unsigned long) (childregs+1);
18841 p->thread.usersp = me->thread.usersp;
18842+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18843
18844 set_tsk_thread_flag(p, TIF_FORK);
18845
18846@@ -379,7 +379,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18847 struct thread_struct *prev = &prev_p->thread;
18848 struct thread_struct *next = &next_p->thread;
18849 int cpu = smp_processor_id();
18850- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18851+ struct tss_struct *tss = init_tss + cpu;
18852 unsigned fsindex, gsindex;
18853 bool preload_fpu;
18854
18855@@ -475,10 +475,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18856 prev->usersp = percpu_read(old_rsp);
18857 percpu_write(old_rsp, next->usersp);
18858 percpu_write(current_task, next_p);
18859+ percpu_write(current_tinfo, &next_p->tinfo);
18860
18861- percpu_write(kernel_stack,
18862- (unsigned long)task_stack_page(next_p) +
18863- THREAD_SIZE - KERNEL_STACK_OFFSET);
18864+ percpu_write(kernel_stack, next->sp0);
18865
18866 /*
18867 * Now maybe reload the debug registers and handle I/O bitmaps
18868@@ -559,12 +558,11 @@ unsigned long get_wchan(struct task_struct *p)
18869 if (!p || p == current || p->state == TASK_RUNNING)
18870 return 0;
18871 stack = (unsigned long)task_stack_page(p);
18872- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
18873+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
18874 return 0;
18875 fp = *(u64 *)(p->thread.sp);
18876 do {
18877- if (fp < (unsigned long)stack ||
18878- fp >= (unsigned long)stack+THREAD_SIZE)
18879+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
18880 return 0;
18881 ip = *(u64 *)(fp+8);
18882 if (!in_sched_functions(ip))
18883diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
18884index c06acdd..3f5fff5 100644
18885--- a/arch/x86/kernel/ptrace.c
18886+++ b/arch/x86/kernel/ptrace.c
18887@@ -925,7 +925,7 @@ static const struct user_regset_view user_x86_32_view; /* Initialized below. */
18888 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
18889 {
18890 int ret;
18891- unsigned long __user *datap = (unsigned long __user *)data;
18892+ unsigned long __user *datap = (__force unsigned long __user *)data;
18893
18894 switch (request) {
18895 /* read the word at location addr in the USER area. */
18896@@ -1012,14 +1012,14 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
18897 if (addr < 0)
18898 return -EIO;
18899 ret = do_get_thread_area(child, addr,
18900- (struct user_desc __user *) data);
18901+ (__force struct user_desc __user *) data);
18902 break;
18903
18904 case PTRACE_SET_THREAD_AREA:
18905 if (addr < 0)
18906 return -EIO;
18907 ret = do_set_thread_area(child, addr,
18908- (struct user_desc __user *) data, 0);
18909+ (__force struct user_desc __user *) data, 0);
18910 break;
18911 #endif
18912
18913@@ -1038,12 +1038,12 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
18914 #ifdef CONFIG_X86_PTRACE_BTS
18915 case PTRACE_BTS_CONFIG:
18916 ret = ptrace_bts_config
18917- (child, data, (struct ptrace_bts_config __user *)addr);
18918+ (child, data, (__force struct ptrace_bts_config __user *)addr);
18919 break;
18920
18921 case PTRACE_BTS_STATUS:
18922 ret = ptrace_bts_status
18923- (child, data, (struct ptrace_bts_config __user *)addr);
18924+ (child, data, (__force struct ptrace_bts_config __user *)addr);
18925 break;
18926
18927 case PTRACE_BTS_SIZE:
18928@@ -1052,7 +1052,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
18929
18930 case PTRACE_BTS_GET:
18931 ret = ptrace_bts_read_record
18932- (child, data, (struct bts_struct __user *) addr);
18933+ (child, data, (__force struct bts_struct __user *) addr);
18934 break;
18935
18936 case PTRACE_BTS_CLEAR:
18937@@ -1061,7 +1061,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
18938
18939 case PTRACE_BTS_DRAIN:
18940 ret = ptrace_bts_drain
18941- (child, data, (struct bts_struct __user *) addr);
18942+ (child, data, (__force struct bts_struct __user *) addr);
18943 break;
18944 #endif /* CONFIG_X86_PTRACE_BTS */
18945
18946@@ -1450,7 +1450,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
18947 info.si_code = si_code;
18948
18949 /* User-mode ip? */
18950- info.si_addr = user_mode_vm(regs) ? (void __user *) regs->ip : NULL;
18951+ info.si_addr = user_mode(regs) ? (__force void __user *) regs->ip : NULL;
18952
18953 /* Send us the fake SIGTRAP */
18954 force_sig_info(SIGTRAP, &info, tsk);
18955@@ -1469,7 +1469,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
18956 * We must return the syscall number to actually look up in the table.
18957 * This can be -1L to skip running any syscall at all.
18958 */
18959-asmregparm long syscall_trace_enter(struct pt_regs *regs)
18960+long syscall_trace_enter(struct pt_regs *regs)
18961 {
18962 long ret = 0;
18963
18964@@ -1514,7 +1514,7 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs)
18965 return ret ?: regs->orig_ax;
18966 }
18967
18968-asmregparm void syscall_trace_leave(struct pt_regs *regs)
18969+void syscall_trace_leave(struct pt_regs *regs)
18970 {
18971 if (unlikely(current->audit_context))
18972 audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
18973diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
18974index cf98100..e76e03d 100644
18975--- a/arch/x86/kernel/reboot.c
18976+++ b/arch/x86/kernel/reboot.c
18977@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
18978 EXPORT_SYMBOL(pm_power_off);
18979
18980 static const struct desc_ptr no_idt = {};
18981-static int reboot_mode;
18982+static unsigned short reboot_mode;
18983 enum reboot_type reboot_type = BOOT_KBD;
18984 int reboot_force;
18985
18986@@ -292,12 +292,12 @@ core_initcall(reboot_init);
18987 controller to pulse the CPU reset line, which is more thorough, but
18988 doesn't work with at least one type of 486 motherboard. It is easy
18989 to stop this code working; hence the copious comments. */
18990-static const unsigned long long
18991-real_mode_gdt_entries [3] =
18992+static struct desc_struct
18993+real_mode_gdt_entries [3] __read_only =
18994 {
18995- 0x0000000000000000ULL, /* Null descriptor */
18996- 0x00009b000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */
18997- 0x000093000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */
18998+ GDT_ENTRY_INIT(0, 0, 0), /* Null descriptor */
18999+ GDT_ENTRY_INIT(0x9b, 0, 0xffff), /* 16-bit real-mode 64k code at 0x00000000 */
19000+ GDT_ENTRY_INIT(0x93, 0x100, 0xffff) /* 16-bit real-mode 64k data at 0x00000100 */
19001 };
19002
19003 static const struct desc_ptr
19004@@ -346,7 +346,7 @@ static const unsigned char jump_to_bios [] =
19005 * specified by the code and length parameters.
19006 * We assume that length will aways be less that 100!
19007 */
19008-void machine_real_restart(const unsigned char *code, int length)
19009+__noreturn void machine_real_restart(const unsigned char *code, unsigned int length)
19010 {
19011 local_irq_disable();
19012
19013@@ -366,8 +366,8 @@ void machine_real_restart(const unsigned char *code, int length)
19014 /* Remap the kernel at virtual address zero, as well as offset zero
19015 from the kernel segment. This assumes the kernel segment starts at
19016 virtual address PAGE_OFFSET. */
19017- memcpy(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
19018- sizeof(swapper_pg_dir [0]) * KERNEL_PGD_PTRS);
19019+ clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
19020+ min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
19021
19022 /*
19023 * Use `swapper_pg_dir' as our page directory.
19024@@ -379,16 +379,15 @@ void machine_real_restart(const unsigned char *code, int length)
19025 boot)". This seems like a fairly standard thing that gets set by
19026 REBOOT.COM programs, and the previous reset routine did this
19027 too. */
19028- *((unsigned short *)0x472) = reboot_mode;
19029+ *(unsigned short *)(__va(0x472)) = reboot_mode;
19030
19031 /* For the switch to real mode, copy some code to low memory. It has
19032 to be in the first 64k because it is running in 16-bit mode, and it
19033 has to have the same physical and virtual address, because it turns
19034 off paging. Copy it near the end of the first page, out of the way
19035 of BIOS variables. */
19036- memcpy((void *)(0x1000 - sizeof(real_mode_switch) - 100),
19037- real_mode_switch, sizeof (real_mode_switch));
19038- memcpy((void *)(0x1000 - 100), code, length);
19039+ memcpy(__va(0x1000 - sizeof (real_mode_switch) - 100), real_mode_switch, sizeof (real_mode_switch));
19040+ memcpy(__va(0x1000 - 100), code, length);
19041
19042 /* Set up the IDT for real mode. */
19043 load_idt(&real_mode_idt);
19044@@ -416,6 +415,7 @@ void machine_real_restart(const unsigned char *code, int length)
19045 __asm__ __volatile__ ("ljmp $0x0008,%0"
19046 :
19047 : "i" ((void *)(0x1000 - sizeof (real_mode_switch) - 100)));
19048+ do { } while (1);
19049 }
19050 #ifdef CONFIG_APM_MODULE
19051 EXPORT_SYMBOL(machine_real_restart);
19052@@ -544,7 +544,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
19053 {
19054 }
19055
19056-static void native_machine_emergency_restart(void)
19057+__noreturn static void native_machine_emergency_restart(void)
19058 {
19059 int i;
19060
19061@@ -659,13 +659,13 @@ void native_machine_shutdown(void)
19062 #endif
19063 }
19064
19065-static void __machine_emergency_restart(int emergency)
19066+static __noreturn void __machine_emergency_restart(int emergency)
19067 {
19068 reboot_emergency = emergency;
19069 machine_ops.emergency_restart();
19070 }
19071
19072-static void native_machine_restart(char *__unused)
19073+static __noreturn void native_machine_restart(char *__unused)
19074 {
19075 printk("machine restart\n");
19076
19077@@ -674,7 +674,7 @@ static void native_machine_restart(char *__unused)
19078 __machine_emergency_restart(0);
19079 }
19080
19081-static void native_machine_halt(void)
19082+static __noreturn void native_machine_halt(void)
19083 {
19084 /* stop other cpus and apics */
19085 machine_shutdown();
19086@@ -685,7 +685,7 @@ static void native_machine_halt(void)
19087 stop_this_cpu(NULL);
19088 }
19089
19090-static void native_machine_power_off(void)
19091+__noreturn static void native_machine_power_off(void)
19092 {
19093 if (pm_power_off) {
19094 if (!reboot_force)
19095@@ -694,6 +694,7 @@ static void native_machine_power_off(void)
19096 }
19097 /* a fallback in case there is no PM info available */
19098 tboot_shutdown(TB_SHUTDOWN_HALT);
19099+ do { } while (1);
19100 }
19101
19102 struct machine_ops machine_ops = {
19103diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
19104index 7a6f3b3..976a959 100644
19105--- a/arch/x86/kernel/relocate_kernel_64.S
19106+++ b/arch/x86/kernel/relocate_kernel_64.S
19107@@ -11,6 +11,7 @@
19108 #include <asm/kexec.h>
19109 #include <asm/processor-flags.h>
19110 #include <asm/pgtable_types.h>
19111+#include <asm/alternative-asm.h>
19112
19113 /*
19114 * Must be relocatable PIC code callable as a C function
19115@@ -167,6 +168,7 @@ identity_mapped:
19116 xorq %r14, %r14
19117 xorq %r15, %r15
19118
19119+ pax_force_retaddr 0, 1
19120 ret
19121
19122 1:
19123diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
19124index 5449a26..0b6c759 100644
19125--- a/arch/x86/kernel/setup.c
19126+++ b/arch/x86/kernel/setup.c
19127@@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p)
19128
19129 if (!boot_params.hdr.root_flags)
19130 root_mountflags &= ~MS_RDONLY;
19131- init_mm.start_code = (unsigned long) _text;
19132- init_mm.end_code = (unsigned long) _etext;
19133+ init_mm.start_code = ktla_ktva((unsigned long) _text);
19134+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
19135 init_mm.end_data = (unsigned long) _edata;
19136 init_mm.brk = _brk_end;
19137
19138- code_resource.start = virt_to_phys(_text);
19139- code_resource.end = virt_to_phys(_etext)-1;
19140- data_resource.start = virt_to_phys(_etext);
19141+ code_resource.start = virt_to_phys(ktla_ktva(_text));
19142+ code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
19143+ data_resource.start = virt_to_phys(_sdata);
19144 data_resource.end = virt_to_phys(_edata)-1;
19145 bss_resource.start = virt_to_phys(&__bss_start);
19146 bss_resource.end = virt_to_phys(&__bss_stop)-1;
19147diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
19148index d559af9..524c6ad 100644
19149--- a/arch/x86/kernel/setup_percpu.c
19150+++ b/arch/x86/kernel/setup_percpu.c
19151@@ -25,19 +25,17 @@
19152 # define DBG(x...)
19153 #endif
19154
19155-DEFINE_PER_CPU(int, cpu_number);
19156+#ifdef CONFIG_SMP
19157+DEFINE_PER_CPU(unsigned int, cpu_number);
19158 EXPORT_PER_CPU_SYMBOL(cpu_number);
19159+#endif
19160
19161-#ifdef CONFIG_X86_64
19162 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
19163-#else
19164-#define BOOT_PERCPU_OFFSET 0
19165-#endif
19166
19167 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
19168 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
19169
19170-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
19171+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
19172 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
19173 };
19174 EXPORT_SYMBOL(__per_cpu_offset);
19175@@ -159,10 +157,10 @@ static inline void setup_percpu_segment(int cpu)
19176 {
19177 #ifdef CONFIG_X86_32
19178 struct desc_struct gdt;
19179+ unsigned long base = per_cpu_offset(cpu);
19180
19181- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
19182- 0x2 | DESCTYPE_S, 0x8);
19183- gdt.s = 1;
19184+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
19185+ 0x83 | DESCTYPE_S, 0xC);
19186 write_gdt_entry(get_cpu_gdt_table(cpu),
19187 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
19188 #endif
19189@@ -212,6 +210,11 @@ void __init setup_per_cpu_areas(void)
19190 /* alrighty, percpu areas up and running */
19191 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
19192 for_each_possible_cpu(cpu) {
19193+#ifdef CONFIG_CC_STACKPROTECTOR
19194+#ifdef CONFIG_X86_32
19195+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
19196+#endif
19197+#endif
19198 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
19199 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
19200 per_cpu(cpu_number, cpu) = cpu;
19201@@ -239,6 +242,12 @@ void __init setup_per_cpu_areas(void)
19202 early_per_cpu_map(x86_cpu_to_node_map, cpu);
19203 #endif
19204 #endif
19205+#ifdef CONFIG_CC_STACKPROTECTOR
19206+#ifdef CONFIG_X86_32
19207+ if (!cpu)
19208+ per_cpu(stack_canary.canary, cpu) = canary;
19209+#endif
19210+#endif
19211 /*
19212 * Up to this point, the boot CPU has been using .data.init
19213 * area. Reload any changed state for the boot CPU.
19214diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
19215index 6a44a76..a9287a1 100644
19216--- a/arch/x86/kernel/signal.c
19217+++ b/arch/x86/kernel/signal.c
19218@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsigned long sp)
19219 * Align the stack pointer according to the i386 ABI,
19220 * i.e. so that on function entry ((sp + 4) & 15) == 0.
19221 */
19222- sp = ((sp + 4) & -16ul) - 4;
19223+ sp = ((sp - 12) & -16ul) - 4;
19224 #else /* !CONFIG_X86_32 */
19225 sp = round_down(sp, 16) - 8;
19226 #endif
19227@@ -248,11 +248,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
19228 * Return an always-bogus address instead so we will die with SIGSEGV.
19229 */
19230 if (onsigstack && !likely(on_sig_stack(sp)))
19231- return (void __user *)-1L;
19232+ return (__force void __user *)-1L;
19233
19234 /* save i387 state */
19235 if (used_math() && save_i387_xstate(*fpstate) < 0)
19236- return (void __user *)-1L;
19237+ return (__force void __user *)-1L;
19238
19239 return (void __user *)sp;
19240 }
19241@@ -307,9 +307,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
19242 }
19243
19244 if (current->mm->context.vdso)
19245- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
19246+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
19247 else
19248- restorer = &frame->retcode;
19249+ restorer = (void __user *)&frame->retcode;
19250 if (ka->sa.sa_flags & SA_RESTORER)
19251 restorer = ka->sa.sa_restorer;
19252
19253@@ -323,7 +323,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
19254 * reasons and because gdb uses it as a signature to notice
19255 * signal handler stack frames.
19256 */
19257- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
19258+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
19259
19260 if (err)
19261 return -EFAULT;
19262@@ -377,7 +377,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
19263 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
19264
19265 /* Set up to return from userspace. */
19266- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
19267+ if (current->mm->context.vdso)
19268+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
19269+ else
19270+ restorer = (void __user *)&frame->retcode;
19271 if (ka->sa.sa_flags & SA_RESTORER)
19272 restorer = ka->sa.sa_restorer;
19273 put_user_ex(restorer, &frame->pretcode);
19274@@ -389,7 +392,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
19275 * reasons and because gdb uses it as a signature to notice
19276 * signal handler stack frames.
19277 */
19278- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
19279+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
19280 } put_user_catch(err);
19281
19282 if (err)
19283@@ -782,6 +785,8 @@ static void do_signal(struct pt_regs *regs)
19284 int signr;
19285 sigset_t *oldset;
19286
19287+ pax_track_stack();
19288+
19289 /*
19290 * We want the common case to go fast, which is why we may in certain
19291 * cases get here from kernel mode. Just return without doing anything
19292@@ -789,7 +794,7 @@ static void do_signal(struct pt_regs *regs)
19293 * X86_32: vm86 regs switched out by assembly code before reaching
19294 * here, so testing against kernel CS suffices.
19295 */
19296- if (!user_mode(regs))
19297+ if (!user_mode_novm(regs))
19298 return;
19299
19300 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
19301diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
19302index 7e8e905..64d5c32 100644
19303--- a/arch/x86/kernel/smpboot.c
19304+++ b/arch/x86/kernel/smpboot.c
19305@@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct *, idle_thread_array);
19306 */
19307 static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
19308
19309-void cpu_hotplug_driver_lock()
19310+void cpu_hotplug_driver_lock(void)
19311 {
19312- mutex_lock(&x86_cpu_hotplug_driver_mutex);
19313+ mutex_lock(&x86_cpu_hotplug_driver_mutex);
19314 }
19315
19316-void cpu_hotplug_driver_unlock()
19317+void cpu_hotplug_driver_unlock(void)
19318 {
19319- mutex_unlock(&x86_cpu_hotplug_driver_mutex);
19320+ mutex_unlock(&x86_cpu_hotplug_driver_mutex);
19321 }
19322
19323 ssize_t arch_cpu_probe(const char *buf, size_t count) { return -1; }
19324@@ -625,7 +625,7 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
19325 * target processor state.
19326 */
19327 startup_ipi_hook(phys_apicid, (unsigned long) start_secondary,
19328- (unsigned long)stack_start.sp);
19329+ stack_start);
19330
19331 /*
19332 * Run STARTUP IPI loop.
19333@@ -743,6 +743,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
19334 set_idle_for_cpu(cpu, c_idle.idle);
19335 do_rest:
19336 per_cpu(current_task, cpu) = c_idle.idle;
19337+ per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo;
19338 #ifdef CONFIG_X86_32
19339 /* Stack for startup_32 can be just as for start_secondary onwards */
19340 irq_ctx_init(cpu);
19341@@ -750,13 +751,15 @@ do_rest:
19342 #else
19343 clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
19344 initial_gs = per_cpu_offset(cpu);
19345- per_cpu(kernel_stack, cpu) =
19346- (unsigned long)task_stack_page(c_idle.idle) -
19347- KERNEL_STACK_OFFSET + THREAD_SIZE;
19348+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
19349 #endif
19350+
19351+ pax_open_kernel();
19352 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
19353+ pax_close_kernel();
19354+
19355 initial_code = (unsigned long)start_secondary;
19356- stack_start.sp = (void *) c_idle.idle->thread.sp;
19357+ stack_start = c_idle.idle->thread.sp;
19358
19359 /* start_ip had better be page-aligned! */
19360 start_ip = setup_trampoline();
19361@@ -891,6 +894,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
19362
19363 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
19364
19365+#ifdef CONFIG_PAX_PER_CPU_PGD
19366+ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
19367+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
19368+ KERNEL_PGD_PTRS);
19369+#endif
19370+
19371 err = do_boot_cpu(apicid, cpu);
19372
19373 if (err) {
19374diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
19375index 3149032..14f1053 100644
19376--- a/arch/x86/kernel/step.c
19377+++ b/arch/x86/kernel/step.c
19378@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
19379 struct desc_struct *desc;
19380 unsigned long base;
19381
19382- seg &= ~7UL;
19383+ seg >>= 3;
19384
19385 mutex_lock(&child->mm->context.lock);
19386- if (unlikely((seg >> 3) >= child->mm->context.size))
19387+ if (unlikely(seg >= child->mm->context.size))
19388 addr = -1L; /* bogus selector, access would fault */
19389 else {
19390 desc = child->mm->context.ldt + seg;
19391@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
19392 addr += base;
19393 }
19394 mutex_unlock(&child->mm->context.lock);
19395- }
19396+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
19397+ addr = ktla_ktva(addr);
19398
19399 return addr;
19400 }
19401@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
19402 unsigned char opcode[15];
19403 unsigned long addr = convert_ip_to_linear(child, regs);
19404
19405+ if (addr == -EINVAL)
19406+ return 0;
19407+
19408 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
19409 for (i = 0; i < copied; i++) {
19410 switch (opcode[i]) {
19411@@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
19412
19413 #ifdef CONFIG_X86_64
19414 case 0x40 ... 0x4f:
19415- if (regs->cs != __USER_CS)
19416+ if ((regs->cs & 0xffff) != __USER_CS)
19417 /* 32-bit mode: register increment */
19418 return 0;
19419 /* 64-bit mode: REX prefix */
19420diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
19421index dee1ff7..a397f7f 100644
19422--- a/arch/x86/kernel/sys_i386_32.c
19423+++ b/arch/x86/kernel/sys_i386_32.c
19424@@ -24,6 +24,21 @@
19425
19426 #include <asm/syscalls.h>
19427
19428+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
19429+{
19430+ unsigned long pax_task_size = TASK_SIZE;
19431+
19432+#ifdef CONFIG_PAX_SEGMEXEC
19433+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
19434+ pax_task_size = SEGMEXEC_TASK_SIZE;
19435+#endif
19436+
19437+ if (len > pax_task_size || addr > pax_task_size - len)
19438+ return -EINVAL;
19439+
19440+ return 0;
19441+}
19442+
19443 /*
19444 * Perform the select(nd, in, out, ex, tv) and mmap() system
19445 * calls. Linux/i386 didn't use to be able to handle more than
19446@@ -58,6 +73,212 @@ out:
19447 return err;
19448 }
19449
19450+unsigned long
19451+arch_get_unmapped_area(struct file *filp, unsigned long addr,
19452+ unsigned long len, unsigned long pgoff, unsigned long flags)
19453+{
19454+ struct mm_struct *mm = current->mm;
19455+ struct vm_area_struct *vma;
19456+ unsigned long start_addr, pax_task_size = TASK_SIZE;
19457+
19458+#ifdef CONFIG_PAX_SEGMEXEC
19459+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
19460+ pax_task_size = SEGMEXEC_TASK_SIZE;
19461+#endif
19462+
19463+ pax_task_size -= PAGE_SIZE;
19464+
19465+ if (len > pax_task_size)
19466+ return -ENOMEM;
19467+
19468+ if (flags & MAP_FIXED)
19469+ return addr;
19470+
19471+#ifdef CONFIG_PAX_RANDMMAP
19472+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19473+#endif
19474+
19475+ if (addr) {
19476+ addr = PAGE_ALIGN(addr);
19477+ if (pax_task_size - len >= addr) {
19478+ vma = find_vma(mm, addr);
19479+ if (check_heap_stack_gap(vma, addr, len))
19480+ return addr;
19481+ }
19482+ }
19483+ if (len > mm->cached_hole_size) {
19484+ start_addr = addr = mm->free_area_cache;
19485+ } else {
19486+ start_addr = addr = mm->mmap_base;
19487+ mm->cached_hole_size = 0;
19488+ }
19489+
19490+#ifdef CONFIG_PAX_PAGEEXEC
19491+ if (!nx_enabled && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
19492+ start_addr = 0x00110000UL;
19493+
19494+#ifdef CONFIG_PAX_RANDMMAP
19495+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19496+ start_addr += mm->delta_mmap & 0x03FFF000UL;
19497+#endif
19498+
19499+ if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
19500+ start_addr = addr = mm->mmap_base;
19501+ else
19502+ addr = start_addr;
19503+ }
19504+#endif
19505+
19506+full_search:
19507+ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
19508+ /* At this point: (!vma || addr < vma->vm_end). */
19509+ if (pax_task_size - len < addr) {
19510+ /*
19511+ * Start a new search - just in case we missed
19512+ * some holes.
19513+ */
19514+ if (start_addr != mm->mmap_base) {
19515+ start_addr = addr = mm->mmap_base;
19516+ mm->cached_hole_size = 0;
19517+ goto full_search;
19518+ }
19519+ return -ENOMEM;
19520+ }
19521+ if (check_heap_stack_gap(vma, addr, len))
19522+ break;
19523+ if (addr + mm->cached_hole_size < vma->vm_start)
19524+ mm->cached_hole_size = vma->vm_start - addr;
19525+ addr = vma->vm_end;
19526+ if (mm->start_brk <= addr && addr < mm->mmap_base) {
19527+ start_addr = addr = mm->mmap_base;
19528+ mm->cached_hole_size = 0;
19529+ goto full_search;
19530+ }
19531+ }
19532+
19533+ /*
19534+ * Remember the place where we stopped the search:
19535+ */
19536+ mm->free_area_cache = addr + len;
19537+ return addr;
19538+}
19539+
19540+unsigned long
19541+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19542+ const unsigned long len, const unsigned long pgoff,
19543+ const unsigned long flags)
19544+{
19545+ struct vm_area_struct *vma;
19546+ struct mm_struct *mm = current->mm;
19547+ unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
19548+
19549+#ifdef CONFIG_PAX_SEGMEXEC
19550+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
19551+ pax_task_size = SEGMEXEC_TASK_SIZE;
19552+#endif
19553+
19554+ pax_task_size -= PAGE_SIZE;
19555+
19556+ /* requested length too big for entire address space */
19557+ if (len > pax_task_size)
19558+ return -ENOMEM;
19559+
19560+ if (flags & MAP_FIXED)
19561+ return addr;
19562+
19563+#ifdef CONFIG_PAX_PAGEEXEC
19564+ if (!nx_enabled && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
19565+ goto bottomup;
19566+#endif
19567+
19568+#ifdef CONFIG_PAX_RANDMMAP
19569+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19570+#endif
19571+
19572+ /* requesting a specific address */
19573+ if (addr) {
19574+ addr = PAGE_ALIGN(addr);
19575+ if (pax_task_size - len >= addr) {
19576+ vma = find_vma(mm, addr);
19577+ if (check_heap_stack_gap(vma, addr, len))
19578+ return addr;
19579+ }
19580+ }
19581+
19582+ /* check if free_area_cache is useful for us */
19583+ if (len <= mm->cached_hole_size) {
19584+ mm->cached_hole_size = 0;
19585+ mm->free_area_cache = mm->mmap_base;
19586+ }
19587+
19588+ /* either no address requested or can't fit in requested address hole */
19589+ addr = mm->free_area_cache;
19590+
19591+ /* make sure it can fit in the remaining address space */
19592+ if (addr > len) {
19593+ vma = find_vma(mm, addr-len);
19594+ if (check_heap_stack_gap(vma, addr - len, len))
19595+ /* remember the address as a hint for next time */
19596+ return (mm->free_area_cache = addr-len);
19597+ }
19598+
19599+ if (mm->mmap_base < len)
19600+ goto bottomup;
19601+
19602+ addr = mm->mmap_base-len;
19603+
19604+ do {
19605+ /*
19606+ * Lookup failure means no vma is above this address,
19607+ * else if new region fits below vma->vm_start,
19608+ * return with success:
19609+ */
19610+ vma = find_vma(mm, addr);
19611+ if (check_heap_stack_gap(vma, addr, len))
19612+ /* remember the address as a hint for next time */
19613+ return (mm->free_area_cache = addr);
19614+
19615+ /* remember the largest hole we saw so far */
19616+ if (addr + mm->cached_hole_size < vma->vm_start)
19617+ mm->cached_hole_size = vma->vm_start - addr;
19618+
19619+ /* try just below the current vma->vm_start */
19620+ addr = skip_heap_stack_gap(vma, len);
19621+ } while (!IS_ERR_VALUE(addr));
19622+
19623+bottomup:
19624+ /*
19625+ * A failed mmap() very likely causes application failure,
19626+ * so fall back to the bottom-up function here. This scenario
19627+ * can happen with large stack limits and large mmap()
19628+ * allocations.
19629+ */
19630+
19631+#ifdef CONFIG_PAX_SEGMEXEC
19632+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
19633+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
19634+ else
19635+#endif
19636+
19637+ mm->mmap_base = TASK_UNMAPPED_BASE;
19638+
19639+#ifdef CONFIG_PAX_RANDMMAP
19640+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19641+ mm->mmap_base += mm->delta_mmap;
19642+#endif
19643+
19644+ mm->free_area_cache = mm->mmap_base;
19645+ mm->cached_hole_size = ~0UL;
19646+ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19647+ /*
19648+ * Restore the topdown base:
19649+ */
19650+ mm->mmap_base = base;
19651+ mm->free_area_cache = base;
19652+ mm->cached_hole_size = ~0UL;
19653+
19654+ return addr;
19655+}
19656
19657 struct sel_arg_struct {
19658 unsigned long n;
19659@@ -93,7 +314,7 @@ asmlinkage int sys_ipc(uint call, int first, int second,
19660 return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL);
19661 case SEMTIMEDOP:
19662 return sys_semtimedop(first, (struct sembuf __user *)ptr, second,
19663- (const struct timespec __user *)fifth);
19664+ (__force const struct timespec __user *)fifth);
19665
19666 case SEMGET:
19667 return sys_semget(first, second, third);
19668@@ -140,7 +361,7 @@ asmlinkage int sys_ipc(uint call, int first, int second,
19669 ret = do_shmat(first, (char __user *) ptr, second, &raddr);
19670 if (ret)
19671 return ret;
19672- return put_user(raddr, (ulong __user *) third);
19673+ return put_user(raddr, (__force ulong __user *) third);
19674 }
19675 case 1: /* iBCS2 emulator entry point */
19676 if (!segment_eq(get_fs(), get_ds()))
19677@@ -207,17 +428,3 @@ asmlinkage int sys_olduname(struct oldold_utsname __user *name)
19678
19679 return error;
19680 }
19681-
19682-
19683-/*
19684- * Do a system call from kernel instead of calling sys_execve so we
19685- * end up with proper pt_regs.
19686- */
19687-int kernel_execve(const char *filename, char *const argv[], char *const envp[])
19688-{
19689- long __res;
19690- asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx"
19691- : "=a" (__res)
19692- : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
19693- return __res;
19694-}
19695diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
19696index 8aa2057..b604bc1 100644
19697--- a/arch/x86/kernel/sys_x86_64.c
19698+++ b/arch/x86/kernel/sys_x86_64.c
19699@@ -32,8 +32,8 @@ out:
19700 return error;
19701 }
19702
19703-static void find_start_end(unsigned long flags, unsigned long *begin,
19704- unsigned long *end)
19705+static void find_start_end(struct mm_struct *mm, unsigned long flags,
19706+ unsigned long *begin, unsigned long *end)
19707 {
19708 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
19709 unsigned long new_begin;
19710@@ -52,7 +52,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
19711 *begin = new_begin;
19712 }
19713 } else {
19714- *begin = TASK_UNMAPPED_BASE;
19715+ *begin = mm->mmap_base;
19716 *end = TASK_SIZE;
19717 }
19718 }
19719@@ -69,16 +69,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
19720 if (flags & MAP_FIXED)
19721 return addr;
19722
19723- find_start_end(flags, &begin, &end);
19724+ find_start_end(mm, flags, &begin, &end);
19725
19726 if (len > end)
19727 return -ENOMEM;
19728
19729+#ifdef CONFIG_PAX_RANDMMAP
19730+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19731+#endif
19732+
19733 if (addr) {
19734 addr = PAGE_ALIGN(addr);
19735 vma = find_vma(mm, addr);
19736- if (end - len >= addr &&
19737- (!vma || addr + len <= vma->vm_start))
19738+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
19739 return addr;
19740 }
19741 if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
19742@@ -106,7 +109,7 @@ full_search:
19743 }
19744 return -ENOMEM;
19745 }
19746- if (!vma || addr + len <= vma->vm_start) {
19747+ if (check_heap_stack_gap(vma, addr, len)) {
19748 /*
19749 * Remember the place where we stopped the search:
19750 */
19751@@ -128,7 +131,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19752 {
19753 struct vm_area_struct *vma;
19754 struct mm_struct *mm = current->mm;
19755- unsigned long addr = addr0;
19756+ unsigned long base = mm->mmap_base, addr = addr0;
19757
19758 /* requested length too big for entire address space */
19759 if (len > TASK_SIZE)
19760@@ -141,13 +144,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19761 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
19762 goto bottomup;
19763
19764+#ifdef CONFIG_PAX_RANDMMAP
19765+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19766+#endif
19767+
19768 /* requesting a specific address */
19769 if (addr) {
19770 addr = PAGE_ALIGN(addr);
19771- vma = find_vma(mm, addr);
19772- if (TASK_SIZE - len >= addr &&
19773- (!vma || addr + len <= vma->vm_start))
19774- return addr;
19775+ if (TASK_SIZE - len >= addr) {
19776+ vma = find_vma(mm, addr);
19777+ if (check_heap_stack_gap(vma, addr, len))
19778+ return addr;
19779+ }
19780 }
19781
19782 /* check if free_area_cache is useful for us */
19783@@ -162,7 +170,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19784 /* make sure it can fit in the remaining address space */
19785 if (addr > len) {
19786 vma = find_vma(mm, addr-len);
19787- if (!vma || addr <= vma->vm_start)
19788+ if (check_heap_stack_gap(vma, addr - len, len))
19789 /* remember the address as a hint for next time */
19790 return mm->free_area_cache = addr-len;
19791 }
19792@@ -179,7 +187,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19793 * return with success:
19794 */
19795 vma = find_vma(mm, addr);
19796- if (!vma || addr+len <= vma->vm_start)
19797+ if (check_heap_stack_gap(vma, addr, len))
19798 /* remember the address as a hint for next time */
19799 return mm->free_area_cache = addr;
19800
19801@@ -188,8 +196,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19802 mm->cached_hole_size = vma->vm_start - addr;
19803
19804 /* try just below the current vma->vm_start */
19805- addr = vma->vm_start-len;
19806- } while (len < vma->vm_start);
19807+ addr = skip_heap_stack_gap(vma, len);
19808+ } while (!IS_ERR_VALUE(addr));
19809
19810 bottomup:
19811 /*
19812@@ -198,13 +206,21 @@ bottomup:
19813 * can happen with large stack limits and large mmap()
19814 * allocations.
19815 */
19816+ mm->mmap_base = TASK_UNMAPPED_BASE;
19817+
19818+#ifdef CONFIG_PAX_RANDMMAP
19819+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19820+ mm->mmap_base += mm->delta_mmap;
19821+#endif
19822+
19823+ mm->free_area_cache = mm->mmap_base;
19824 mm->cached_hole_size = ~0UL;
19825- mm->free_area_cache = TASK_UNMAPPED_BASE;
19826 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19827 /*
19828 * Restore the topdown base:
19829 */
19830- mm->free_area_cache = mm->mmap_base;
19831+ mm->mmap_base = base;
19832+ mm->free_area_cache = base;
19833 mm->cached_hole_size = ~0UL;
19834
19835 return addr;
19836diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
19837index 76d70a4..4c94a44 100644
19838--- a/arch/x86/kernel/syscall_table_32.S
19839+++ b/arch/x86/kernel/syscall_table_32.S
19840@@ -1,3 +1,4 @@
19841+.section .rodata,"a",@progbits
19842 ENTRY(sys_call_table)
19843 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
19844 .long sys_exit
19845diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
19846index 46b8277..3349d55 100644
19847--- a/arch/x86/kernel/tboot.c
19848+++ b/arch/x86/kernel/tboot.c
19849@@ -216,7 +216,7 @@ static int tboot_setup_sleep(void)
19850
19851 void tboot_shutdown(u32 shutdown_type)
19852 {
19853- void (*shutdown)(void);
19854+ void (* __noreturn shutdown)(void);
19855
19856 if (!tboot_enabled())
19857 return;
19858@@ -238,7 +238,7 @@ void tboot_shutdown(u32 shutdown_type)
19859
19860 switch_to_tboot_pt();
19861
19862- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
19863+ shutdown = (void *)tboot->shutdown_entry;
19864 shutdown();
19865
19866 /* should not reach here */
19867@@ -295,7 +295,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
19868 tboot_shutdown(acpi_shutdown_map[sleep_state]);
19869 }
19870
19871-static atomic_t ap_wfs_count;
19872+static atomic_unchecked_t ap_wfs_count;
19873
19874 static int tboot_wait_for_aps(int num_aps)
19875 {
19876@@ -319,9 +319,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
19877 {
19878 switch (action) {
19879 case CPU_DYING:
19880- atomic_inc(&ap_wfs_count);
19881+ atomic_inc_unchecked(&ap_wfs_count);
19882 if (num_online_cpus() == 1)
19883- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
19884+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
19885 return NOTIFY_BAD;
19886 break;
19887 }
19888@@ -340,7 +340,7 @@ static __init int tboot_late_init(void)
19889
19890 tboot_create_trampoline();
19891
19892- atomic_set(&ap_wfs_count, 0);
19893+ atomic_set_unchecked(&ap_wfs_count, 0);
19894 register_hotcpu_notifier(&tboot_cpu_notifier);
19895 return 0;
19896 }
19897diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
19898index be25734..87fe232 100644
19899--- a/arch/x86/kernel/time.c
19900+++ b/arch/x86/kernel/time.c
19901@@ -26,17 +26,13 @@
19902 int timer_ack;
19903 #endif
19904
19905-#ifdef CONFIG_X86_64
19906-volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
19907-#endif
19908-
19909 unsigned long profile_pc(struct pt_regs *regs)
19910 {
19911 unsigned long pc = instruction_pointer(regs);
19912
19913- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
19914+ if (!user_mode(regs) && in_lock_functions(pc)) {
19915 #ifdef CONFIG_FRAME_POINTER
19916- return *(unsigned long *)(regs->bp + sizeof(long));
19917+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
19918 #else
19919 unsigned long *sp =
19920 (unsigned long *)kernel_stack_pointer(regs);
19921@@ -45,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
19922 * or above a saved flags. Eflags has bits 22-31 zero,
19923 * kernel addresses don't.
19924 */
19925+
19926+#ifdef CONFIG_PAX_KERNEXEC
19927+ return ktla_ktva(sp[0]);
19928+#else
19929 if (sp[0] >> 22)
19930 return sp[0];
19931 if (sp[1] >> 22)
19932 return sp[1];
19933 #endif
19934+
19935+#endif
19936 }
19937 return pc;
19938 }
19939diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
19940index 6bb7b85..dd853e1 100644
19941--- a/arch/x86/kernel/tls.c
19942+++ b/arch/x86/kernel/tls.c
19943@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
19944 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
19945 return -EINVAL;
19946
19947+#ifdef CONFIG_PAX_SEGMEXEC
19948+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
19949+ return -EINVAL;
19950+#endif
19951+
19952 set_tls_desc(p, idx, &info, 1);
19953
19954 return 0;
19955diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
19956index 8508237..229b664 100644
19957--- a/arch/x86/kernel/trampoline_32.S
19958+++ b/arch/x86/kernel/trampoline_32.S
19959@@ -32,6 +32,12 @@
19960 #include <asm/segment.h>
19961 #include <asm/page_types.h>
19962
19963+#ifdef CONFIG_PAX_KERNEXEC
19964+#define ta(X) (X)
19965+#else
19966+#define ta(X) ((X) - __PAGE_OFFSET)
19967+#endif
19968+
19969 /* We can free up trampoline after bootup if cpu hotplug is not supported. */
19970 __CPUINITRODATA
19971 .code16
19972@@ -60,7 +66,7 @@ r_base = .
19973 inc %ax # protected mode (PE) bit
19974 lmsw %ax # into protected mode
19975 # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
19976- ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET)
19977+ ljmpl $__BOOT_CS, $ta(startup_32_smp)
19978
19979 # These need to be in the same 64K segment as the above;
19980 # hence we don't use the boot_gdt_descr defined in head.S
19981diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
19982index 3af2dff..ba8aa49 100644
19983--- a/arch/x86/kernel/trampoline_64.S
19984+++ b/arch/x86/kernel/trampoline_64.S
19985@@ -91,7 +91,7 @@ startup_32:
19986 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
19987 movl %eax, %ds
19988
19989- movl $X86_CR4_PAE, %eax
19990+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
19991 movl %eax, %cr4 # Enable PAE mode
19992
19993 # Setup trampoline 4 level pagetables
19994@@ -127,7 +127,7 @@ startup_64:
19995 no_longmode:
19996 hlt
19997 jmp no_longmode
19998-#include "verify_cpu_64.S"
19999+#include "verify_cpu.S"
20000
20001 # Careful these need to be in the same 64K segment as the above;
20002 tidt:
20003@@ -138,7 +138,7 @@ tidt:
20004 # so the kernel can live anywhere
20005 .balign 4
20006 tgdt:
20007- .short tgdt_end - tgdt # gdt limit
20008+ .short tgdt_end - tgdt - 1 # gdt limit
20009 .long tgdt - r_base
20010 .short 0
20011 .quad 0x00cf9b000000ffff # __KERNEL32_CS
20012diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
20013index 7e37dce..ec3f8e5 100644
20014--- a/arch/x86/kernel/traps.c
20015+++ b/arch/x86/kernel/traps.c
20016@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
20017
20018 /* Do we ignore FPU interrupts ? */
20019 char ignore_fpu_irq;
20020-
20021-/*
20022- * The IDT has to be page-aligned to simplify the Pentium
20023- * F0 0F bug workaround.
20024- */
20025-gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
20026 #endif
20027
20028 DECLARE_BITMAP(used_vectors, NR_VECTORS);
20029@@ -112,19 +106,19 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
20030 static inline void
20031 die_if_kernel(const char *str, struct pt_regs *regs, long err)
20032 {
20033- if (!user_mode_vm(regs))
20034+ if (!user_mode(regs))
20035 die(str, regs, err);
20036 }
20037 #endif
20038
20039 static void __kprobes
20040-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
20041+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
20042 long error_code, siginfo_t *info)
20043 {
20044 struct task_struct *tsk = current;
20045
20046 #ifdef CONFIG_X86_32
20047- if (regs->flags & X86_VM_MASK) {
20048+ if (v8086_mode(regs)) {
20049 /*
20050 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
20051 * On nmi (interrupt 2), do_trap should not be called.
20052@@ -135,7 +129,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
20053 }
20054 #endif
20055
20056- if (!user_mode(regs))
20057+ if (!user_mode_novm(regs))
20058 goto kernel_trap;
20059
20060 #ifdef CONFIG_X86_32
20061@@ -158,7 +152,7 @@ trap_signal:
20062 printk_ratelimit()) {
20063 printk(KERN_INFO
20064 "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
20065- tsk->comm, tsk->pid, str,
20066+ tsk->comm, task_pid_nr(tsk), str,
20067 regs->ip, regs->sp, error_code);
20068 print_vma_addr(" in ", regs->ip);
20069 printk("\n");
20070@@ -175,8 +169,20 @@ kernel_trap:
20071 if (!fixup_exception(regs)) {
20072 tsk->thread.error_code = error_code;
20073 tsk->thread.trap_no = trapnr;
20074+
20075+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20076+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
20077+ str = "PAX: suspicious stack segment fault";
20078+#endif
20079+
20080 die(str, regs, error_code);
20081 }
20082+
20083+#ifdef CONFIG_PAX_REFCOUNT
20084+ if (trapnr == 4)
20085+ pax_report_refcount_overflow(regs);
20086+#endif
20087+
20088 return;
20089
20090 #ifdef CONFIG_X86_32
20091@@ -265,14 +271,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
20092 conditional_sti(regs);
20093
20094 #ifdef CONFIG_X86_32
20095- if (regs->flags & X86_VM_MASK)
20096+ if (v8086_mode(regs))
20097 goto gp_in_vm86;
20098 #endif
20099
20100 tsk = current;
20101- if (!user_mode(regs))
20102+ if (!user_mode_novm(regs))
20103 goto gp_in_kernel;
20104
20105+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
20106+ if (!nx_enabled && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
20107+ struct mm_struct *mm = tsk->mm;
20108+ unsigned long limit;
20109+
20110+ down_write(&mm->mmap_sem);
20111+ limit = mm->context.user_cs_limit;
20112+ if (limit < TASK_SIZE) {
20113+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
20114+ up_write(&mm->mmap_sem);
20115+ return;
20116+ }
20117+ up_write(&mm->mmap_sem);
20118+ }
20119+#endif
20120+
20121 tsk->thread.error_code = error_code;
20122 tsk->thread.trap_no = 13;
20123
20124@@ -305,6 +327,13 @@ gp_in_kernel:
20125 if (notify_die(DIE_GPF, "general protection fault", regs,
20126 error_code, 13, SIGSEGV) == NOTIFY_STOP)
20127 return;
20128+
20129+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20130+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
20131+ die("PAX: suspicious general protection fault", regs, error_code);
20132+ else
20133+#endif
20134+
20135 die("general protection fault", regs, error_code);
20136 }
20137
20138@@ -435,6 +464,17 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
20139 dotraplinkage notrace __kprobes void
20140 do_nmi(struct pt_regs *regs, long error_code)
20141 {
20142+
20143+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20144+ if (!user_mode(regs)) {
20145+ unsigned long cs = regs->cs & 0xFFFF;
20146+ unsigned long ip = ktva_ktla(regs->ip);
20147+
20148+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
20149+ regs->ip = ip;
20150+ }
20151+#endif
20152+
20153 nmi_enter();
20154
20155 inc_irq_stat(__nmi_count);
20156@@ -558,7 +598,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
20157 }
20158
20159 #ifdef CONFIG_X86_32
20160- if (regs->flags & X86_VM_MASK)
20161+ if (v8086_mode(regs))
20162 goto debug_vm86;
20163 #endif
20164
20165@@ -570,7 +610,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
20166 * kernel space (but re-enable TF when returning to user mode).
20167 */
20168 if (condition & DR_STEP) {
20169- if (!user_mode(regs))
20170+ if (!user_mode_novm(regs))
20171 goto clear_TF_reenable;
20172 }
20173
20174@@ -757,7 +797,7 @@ do_simd_coprocessor_error(struct pt_regs *regs, long error_code)
20175 * Handle strange cache flush from user space exception
20176 * in all other cases. This is undocumented behaviour.
20177 */
20178- if (regs->flags & X86_VM_MASK) {
20179+ if (v8086_mode(regs)) {
20180 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
20181 return;
20182 }
20183@@ -798,7 +838,7 @@ asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void)
20184 void __math_state_restore(void)
20185 {
20186 struct thread_info *thread = current_thread_info();
20187- struct task_struct *tsk = thread->task;
20188+ struct task_struct *tsk = current;
20189
20190 /*
20191 * Paranoid restore. send a SIGSEGV if we fail to restore the state.
20192@@ -825,8 +865,7 @@ void __math_state_restore(void)
20193 */
20194 asmlinkage void math_state_restore(void)
20195 {
20196- struct thread_info *thread = current_thread_info();
20197- struct task_struct *tsk = thread->task;
20198+ struct task_struct *tsk = current;
20199
20200 if (!tsk_used_math(tsk)) {
20201 local_irq_enable();
20202diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
20203new file mode 100644
20204index 0000000..50c5edd
20205--- /dev/null
20206+++ b/arch/x86/kernel/verify_cpu.S
20207@@ -0,0 +1,140 @@
20208+/*
20209+ *
20210+ * verify_cpu.S - Code for cpu long mode and SSE verification. This
20211+ * code has been borrowed from boot/setup.S and was introduced by
20212+ * Andi Kleen.
20213+ *
20214+ * Copyright (c) 2007 Andi Kleen (ak@suse.de)
20215+ * Copyright (c) 2007 Eric Biederman (ebiederm@xmission.com)
20216+ * Copyright (c) 2007 Vivek Goyal (vgoyal@in.ibm.com)
20217+ * Copyright (c) 2010 Kees Cook (kees.cook@canonical.com)
20218+ *
20219+ * This source code is licensed under the GNU General Public License,
20220+ * Version 2. See the file COPYING for more details.
20221+ *
20222+ * This is a common code for verification whether CPU supports
20223+ * long mode and SSE or not. It is not called directly instead this
20224+ * file is included at various places and compiled in that context.
20225+ * This file is expected to run in 32bit code. Currently:
20226+ *
20227+ * arch/x86/boot/compressed/head_64.S: Boot cpu verification
20228+ * arch/x86/kernel/trampoline_64.S: secondary processor verification
20229+ * arch/x86/kernel/head_32.S: processor startup
20230+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
20231+ *
20232+ * verify_cpu, returns the status of longmode and SSE in register %eax.
20233+ * 0: Success 1: Failure
20234+ *
20235+ * On Intel, the XD_DISABLE flag will be cleared as a side-effect.
20236+ *
20237+ * The caller needs to check for the error code and take the action
20238+ * appropriately. Either display a message or halt.
20239+ */
20240+
20241+#include <asm/cpufeature.h>
20242+#include <asm/msr-index.h>
20243+
20244+verify_cpu:
20245+ pushfl # Save caller passed flags
20246+ pushl $0 # Kill any dangerous flags
20247+ popfl
20248+
20249+ pushfl # standard way to check for cpuid
20250+ popl %eax
20251+ movl %eax,%ebx
20252+ xorl $0x200000,%eax
20253+ pushl %eax
20254+ popfl
20255+ pushfl
20256+ popl %eax
20257+ cmpl %eax,%ebx
20258+ jz verify_cpu_no_longmode # cpu has no cpuid
20259+
20260+ movl $0x0,%eax # See if cpuid 1 is implemented
20261+ cpuid
20262+ cmpl $0x1,%eax
20263+ jb verify_cpu_no_longmode # no cpuid 1
20264+
20265+ xor %di,%di
20266+ cmpl $0x68747541,%ebx # AuthenticAMD
20267+ jnz verify_cpu_noamd
20268+ cmpl $0x69746e65,%edx
20269+ jnz verify_cpu_noamd
20270+ cmpl $0x444d4163,%ecx
20271+ jnz verify_cpu_noamd
20272+ mov $1,%di # cpu is from AMD
20273+ jmp verify_cpu_check
20274+
20275+verify_cpu_noamd:
20276+ cmpl $0x756e6547,%ebx # GenuineIntel?
20277+ jnz verify_cpu_check
20278+ cmpl $0x49656e69,%edx
20279+ jnz verify_cpu_check
20280+ cmpl $0x6c65746e,%ecx
20281+ jnz verify_cpu_check
20282+
20283+ # only call IA32_MISC_ENABLE when:
20284+ # family > 6 || (family == 6 && model >= 0xd)
20285+ movl $0x1, %eax # check CPU family and model
20286+ cpuid
20287+ movl %eax, %ecx
20288+
20289+ andl $0x0ff00f00, %eax # mask family and extended family
20290+ shrl $8, %eax
20291+ cmpl $6, %eax
20292+ ja verify_cpu_clear_xd # family > 6, ok
20293+ jb verify_cpu_check # family < 6, skip
20294+
20295+ andl $0x000f00f0, %ecx # mask model and extended model
20296+ shrl $4, %ecx
20297+ cmpl $0xd, %ecx
20298+ jb verify_cpu_check # family == 6, model < 0xd, skip
20299+
20300+verify_cpu_clear_xd:
20301+ movl $MSR_IA32_MISC_ENABLE, %ecx
20302+ rdmsr
20303+ btrl $2, %edx # clear MSR_IA32_MISC_ENABLE_XD_DISABLE
20304+ jnc verify_cpu_check # only write MSR if bit was changed
20305+ wrmsr
20306+
20307+verify_cpu_check:
20308+ movl $0x1,%eax # Does the cpu have what it takes
20309+ cpuid
20310+ andl $REQUIRED_MASK0,%edx
20311+ xorl $REQUIRED_MASK0,%edx
20312+ jnz verify_cpu_no_longmode
20313+
20314+ movl $0x80000000,%eax # See if extended cpuid is implemented
20315+ cpuid
20316+ cmpl $0x80000001,%eax
20317+ jb verify_cpu_no_longmode # no extended cpuid
20318+
20319+ movl $0x80000001,%eax # Does the cpu have what it takes
20320+ cpuid
20321+ andl $REQUIRED_MASK1,%edx
20322+ xorl $REQUIRED_MASK1,%edx
20323+ jnz verify_cpu_no_longmode
20324+
20325+verify_cpu_sse_test:
20326+ movl $1,%eax
20327+ cpuid
20328+ andl $SSE_MASK,%edx
20329+ cmpl $SSE_MASK,%edx
20330+ je verify_cpu_sse_ok
20331+ test %di,%di
20332+ jz verify_cpu_no_longmode # only try to force SSE on AMD
20333+ movl $MSR_K7_HWCR,%ecx
20334+ rdmsr
20335+ btr $15,%eax # enable SSE
20336+ wrmsr
20337+ xor %di,%di # don't loop
20338+ jmp verify_cpu_sse_test # try again
20339+
20340+verify_cpu_no_longmode:
20341+ popfl # Restore caller passed flags
20342+ movl $1,%eax
20343+ ret
20344+verify_cpu_sse_ok:
20345+ popfl # Restore caller passed flags
20346+ xorl %eax, %eax
20347+ ret
20348diff --git a/arch/x86/kernel/verify_cpu_64.S b/arch/x86/kernel/verify_cpu_64.S
20349deleted file mode 100644
20350index 45b6f8a..0000000
20351--- a/arch/x86/kernel/verify_cpu_64.S
20352+++ /dev/null
20353@@ -1,105 +0,0 @@
20354-/*
20355- *
20356- * verify_cpu.S - Code for cpu long mode and SSE verification. This
20357- * code has been borrowed from boot/setup.S and was introduced by
20358- * Andi Kleen.
20359- *
20360- * Copyright (c) 2007 Andi Kleen (ak@suse.de)
20361- * Copyright (c) 2007 Eric Biederman (ebiederm@xmission.com)
20362- * Copyright (c) 2007 Vivek Goyal (vgoyal@in.ibm.com)
20363- *
20364- * This source code is licensed under the GNU General Public License,
20365- * Version 2. See the file COPYING for more details.
20366- *
20367- * This is a common code for verification whether CPU supports
20368- * long mode and SSE or not. It is not called directly instead this
20369- * file is included at various places and compiled in that context.
20370- * Following are the current usage.
20371- *
20372- * This file is included by both 16bit and 32bit code.
20373- *
20374- * arch/x86_64/boot/setup.S : Boot cpu verification (16bit)
20375- * arch/x86_64/boot/compressed/head.S: Boot cpu verification (32bit)
20376- * arch/x86_64/kernel/trampoline.S: secondary processor verfication (16bit)
20377- * arch/x86_64/kernel/acpi/wakeup.S:Verfication at resume (16bit)
20378- *
20379- * verify_cpu, returns the status of cpu check in register %eax.
20380- * 0: Success 1: Failure
20381- *
20382- * The caller needs to check for the error code and take the action
20383- * appropriately. Either display a message or halt.
20384- */
20385-
20386-#include <asm/cpufeature.h>
20387-
20388-verify_cpu:
20389- pushfl # Save caller passed flags
20390- pushl $0 # Kill any dangerous flags
20391- popfl
20392-
20393- pushfl # standard way to check for cpuid
20394- popl %eax
20395- movl %eax,%ebx
20396- xorl $0x200000,%eax
20397- pushl %eax
20398- popfl
20399- pushfl
20400- popl %eax
20401- cmpl %eax,%ebx
20402- jz verify_cpu_no_longmode # cpu has no cpuid
20403-
20404- movl $0x0,%eax # See if cpuid 1 is implemented
20405- cpuid
20406- cmpl $0x1,%eax
20407- jb verify_cpu_no_longmode # no cpuid 1
20408-
20409- xor %di,%di
20410- cmpl $0x68747541,%ebx # AuthenticAMD
20411- jnz verify_cpu_noamd
20412- cmpl $0x69746e65,%edx
20413- jnz verify_cpu_noamd
20414- cmpl $0x444d4163,%ecx
20415- jnz verify_cpu_noamd
20416- mov $1,%di # cpu is from AMD
20417-
20418-verify_cpu_noamd:
20419- movl $0x1,%eax # Does the cpu have what it takes
20420- cpuid
20421- andl $REQUIRED_MASK0,%edx
20422- xorl $REQUIRED_MASK0,%edx
20423- jnz verify_cpu_no_longmode
20424-
20425- movl $0x80000000,%eax # See if extended cpuid is implemented
20426- cpuid
20427- cmpl $0x80000001,%eax
20428- jb verify_cpu_no_longmode # no extended cpuid
20429-
20430- movl $0x80000001,%eax # Does the cpu have what it takes
20431- cpuid
20432- andl $REQUIRED_MASK1,%edx
20433- xorl $REQUIRED_MASK1,%edx
20434- jnz verify_cpu_no_longmode
20435-
20436-verify_cpu_sse_test:
20437- movl $1,%eax
20438- cpuid
20439- andl $SSE_MASK,%edx
20440- cmpl $SSE_MASK,%edx
20441- je verify_cpu_sse_ok
20442- test %di,%di
20443- jz verify_cpu_no_longmode # only try to force SSE on AMD
20444- movl $0xc0010015,%ecx # HWCR
20445- rdmsr
20446- btr $15,%eax # enable SSE
20447- wrmsr
20448- xor %di,%di # don't loop
20449- jmp verify_cpu_sse_test # try again
20450-
20451-verify_cpu_no_longmode:
20452- popfl # Restore caller passed flags
20453- movl $1,%eax
20454- ret
20455-verify_cpu_sse_ok:
20456- popfl # Restore caller passed flags
20457- xorl %eax, %eax
20458- ret
20459diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
20460index 9c4e625..c992817 100644
20461--- a/arch/x86/kernel/vm86_32.c
20462+++ b/arch/x86/kernel/vm86_32.c
20463@@ -41,6 +41,7 @@
20464 #include <linux/ptrace.h>
20465 #include <linux/audit.h>
20466 #include <linux/stddef.h>
20467+#include <linux/grsecurity.h>
20468
20469 #include <asm/uaccess.h>
20470 #include <asm/io.h>
20471@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
20472 do_exit(SIGSEGV);
20473 }
20474
20475- tss = &per_cpu(init_tss, get_cpu());
20476+ tss = init_tss + get_cpu();
20477 current->thread.sp0 = current->thread.saved_sp0;
20478 current->thread.sysenter_cs = __KERNEL_CS;
20479 load_sp0(tss, &current->thread);
20480@@ -208,6 +209,13 @@ int sys_vm86old(struct pt_regs *regs)
20481 struct task_struct *tsk;
20482 int tmp, ret = -EPERM;
20483
20484+#ifdef CONFIG_GRKERNSEC_VM86
20485+ if (!capable(CAP_SYS_RAWIO)) {
20486+ gr_handle_vm86();
20487+ goto out;
20488+ }
20489+#endif
20490+
20491 tsk = current;
20492 if (tsk->thread.saved_sp0)
20493 goto out;
20494@@ -238,6 +246,14 @@ int sys_vm86(struct pt_regs *regs)
20495 int tmp, ret;
20496 struct vm86plus_struct __user *v86;
20497
20498+#ifdef CONFIG_GRKERNSEC_VM86
20499+ if (!capable(CAP_SYS_RAWIO)) {
20500+ gr_handle_vm86();
20501+ ret = -EPERM;
20502+ goto out;
20503+ }
20504+#endif
20505+
20506 tsk = current;
20507 switch (regs->bx) {
20508 case VM86_REQUEST_IRQ:
20509@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
20510 tsk->thread.saved_fs = info->regs32->fs;
20511 tsk->thread.saved_gs = get_user_gs(info->regs32);
20512
20513- tss = &per_cpu(init_tss, get_cpu());
20514+ tss = init_tss + get_cpu();
20515 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
20516 if (cpu_has_sep)
20517 tsk->thread.sysenter_cs = 0;
20518@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
20519 goto cannot_handle;
20520 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
20521 goto cannot_handle;
20522- intr_ptr = (unsigned long __user *) (i << 2);
20523+ intr_ptr = (__force unsigned long __user *) (i << 2);
20524 if (get_user(segoffs, intr_ptr))
20525 goto cannot_handle;
20526 if ((segoffs >> 16) == BIOSSEG)
20527diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
20528index d430e4c..831f817 100644
20529--- a/arch/x86/kernel/vmi_32.c
20530+++ b/arch/x86/kernel/vmi_32.c
20531@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) (VROMFUNC)(void);
20532 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
20533
20534 #define call_vrom_func(rom,func) \
20535- (((VROMFUNC *)(rom->func))())
20536+ (((VROMFUNC *)(ktva_ktla(rom.func)))())
20537
20538 #define call_vrom_long_func(rom,func,arg) \
20539- (((VROMLONGFUNC *)(rom->func)) (arg))
20540+({\
20541+ u64 __reloc = ((VROMLONGFUNC *)(ktva_ktla(rom.func))) (arg);\
20542+ struct vmi_relocation_info *const __rel = (struct vmi_relocation_info *)&__reloc;\
20543+ __rel->eip = (unsigned char *)ktva_ktla((unsigned long)__rel->eip);\
20544+ __reloc;\
20545+})
20546
20547-static struct vrom_header *vmi_rom;
20548+static struct vrom_header vmi_rom __attribute((__section__(".vmi.rom"), __aligned__(PAGE_SIZE)));
20549 static int disable_pge;
20550 static int disable_pse;
20551 static int disable_sep;
20552@@ -76,10 +81,10 @@ static struct {
20553 void (*set_initial_ap_state)(int, int);
20554 void (*halt)(void);
20555 void (*set_lazy_mode)(int mode);
20556-} vmi_ops;
20557+} __no_const vmi_ops __read_only;
20558
20559 /* Cached VMI operations */
20560-struct vmi_timer_ops vmi_timer_ops;
20561+struct vmi_timer_ops vmi_timer_ops __read_only;
20562
20563 /*
20564 * VMI patching routines.
20565@@ -94,7 +99,7 @@ struct vmi_timer_ops vmi_timer_ops;
20566 static inline void patch_offset(void *insnbuf,
20567 unsigned long ip, unsigned long dest)
20568 {
20569- *(unsigned long *)(insnbuf+1) = dest-ip-5;
20570+ *(unsigned long *)(insnbuf+1) = dest-ip-5;
20571 }
20572
20573 static unsigned patch_internal(int call, unsigned len, void *insnbuf,
20574@@ -102,6 +107,7 @@ static unsigned patch_internal(int call, unsigned len, void *insnbuf,
20575 {
20576 u64 reloc;
20577 struct vmi_relocation_info *const rel = (struct vmi_relocation_info *)&reloc;
20578+
20579 reloc = call_vrom_long_func(vmi_rom, get_reloc, call);
20580 switch(rel->type) {
20581 case VMI_RELOCATION_CALL_REL:
20582@@ -404,13 +410,13 @@ static void vmi_set_pud(pud_t *pudp, pud_t pudval)
20583
20584 static void vmi_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
20585 {
20586- const pte_t pte = { .pte = 0 };
20587+ const pte_t pte = __pte(0ULL);
20588 vmi_ops.set_pte(pte, ptep, vmi_flags_addr(mm, addr, VMI_PAGE_PT, 0));
20589 }
20590
20591 static void vmi_pmd_clear(pmd_t *pmd)
20592 {
20593- const pte_t pte = { .pte = 0 };
20594+ const pte_t pte = __pte(0ULL);
20595 vmi_ops.set_pte(pte, (pte_t *)pmd, VMI_PAGE_PD);
20596 }
20597 #endif
20598@@ -438,10 +444,10 @@ vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip,
20599 ap.ss = __KERNEL_DS;
20600 ap.esp = (unsigned long) start_esp;
20601
20602- ap.ds = __USER_DS;
20603- ap.es = __USER_DS;
20604+ ap.ds = __KERNEL_DS;
20605+ ap.es = __KERNEL_DS;
20606 ap.fs = __KERNEL_PERCPU;
20607- ap.gs = __KERNEL_STACK_CANARY;
20608+ savesegment(gs, ap.gs);
20609
20610 ap.eflags = 0;
20611
20612@@ -486,6 +492,18 @@ static void vmi_leave_lazy_mmu(void)
20613 paravirt_leave_lazy_mmu();
20614 }
20615
20616+#ifdef CONFIG_PAX_KERNEXEC
20617+static unsigned long vmi_pax_open_kernel(void)
20618+{
20619+ return 0;
20620+}
20621+
20622+static unsigned long vmi_pax_close_kernel(void)
20623+{
20624+ return 0;
20625+}
20626+#endif
20627+
20628 static inline int __init check_vmi_rom(struct vrom_header *rom)
20629 {
20630 struct pci_header *pci;
20631@@ -498,6 +516,10 @@ static inline int __init check_vmi_rom(struct vrom_header *rom)
20632 return 0;
20633 if (rom->vrom_signature != VMI_SIGNATURE)
20634 return 0;
20635+ if (rom->rom_length * 512 > sizeof(*rom)) {
20636+ printk(KERN_WARNING "PAX: VMI: ROM size too big: %x\n", rom->rom_length * 512);
20637+ return 0;
20638+ }
20639 if (rom->api_version_maj != VMI_API_REV_MAJOR ||
20640 rom->api_version_min+1 < VMI_API_REV_MINOR+1) {
20641 printk(KERN_WARNING "VMI: Found mismatched rom version %d.%d\n",
20642@@ -562,7 +584,7 @@ static inline int __init probe_vmi_rom(void)
20643 struct vrom_header *romstart;
20644 romstart = (struct vrom_header *)isa_bus_to_virt(base);
20645 if (check_vmi_rom(romstart)) {
20646- vmi_rom = romstart;
20647+ vmi_rom = *romstart;
20648 return 1;
20649 }
20650 }
20651@@ -836,6 +858,11 @@ static inline int __init activate_vmi(void)
20652
20653 para_fill(pv_irq_ops.safe_halt, Halt);
20654
20655+#ifdef CONFIG_PAX_KERNEXEC
20656+ pv_mmu_ops.pax_open_kernel = vmi_pax_open_kernel;
20657+ pv_mmu_ops.pax_close_kernel = vmi_pax_close_kernel;
20658+#endif
20659+
20660 /*
20661 * Alternative instruction rewriting doesn't happen soon enough
20662 * to convert VMI_IRET to a call instead of a jump; so we have
20663@@ -853,16 +880,16 @@ static inline int __init activate_vmi(void)
20664
20665 void __init vmi_init(void)
20666 {
20667- if (!vmi_rom)
20668+ if (!vmi_rom.rom_signature)
20669 probe_vmi_rom();
20670 else
20671- check_vmi_rom(vmi_rom);
20672+ check_vmi_rom(&vmi_rom);
20673
20674 /* In case probing for or validating the ROM failed, basil */
20675- if (!vmi_rom)
20676+ if (!vmi_rom.rom_signature)
20677 return;
20678
20679- reserve_top_address(-vmi_rom->virtual_top);
20680+ reserve_top_address(-vmi_rom.virtual_top);
20681
20682 #ifdef CONFIG_X86_IO_APIC
20683 /* This is virtual hardware; timer routing is wired correctly */
20684@@ -874,7 +901,7 @@ void __init vmi_activate(void)
20685 {
20686 unsigned long flags;
20687
20688- if (!vmi_rom)
20689+ if (!vmi_rom.rom_signature)
20690 return;
20691
20692 local_irq_save(flags);
20693diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
20694index 3c68fe2..12c8280 100644
20695--- a/arch/x86/kernel/vmlinux.lds.S
20696+++ b/arch/x86/kernel/vmlinux.lds.S
20697@@ -26,6 +26,13 @@
20698 #include <asm/page_types.h>
20699 #include <asm/cache.h>
20700 #include <asm/boot.h>
20701+#include <asm/segment.h>
20702+
20703+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20704+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
20705+#else
20706+#define __KERNEL_TEXT_OFFSET 0
20707+#endif
20708
20709 #undef i386 /* in case the preprocessor is a 32bit one */
20710
20711@@ -34,40 +41,53 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
20712 #ifdef CONFIG_X86_32
20713 OUTPUT_ARCH(i386)
20714 ENTRY(phys_startup_32)
20715-jiffies = jiffies_64;
20716 #else
20717 OUTPUT_ARCH(i386:x86-64)
20718 ENTRY(phys_startup_64)
20719-jiffies_64 = jiffies;
20720 #endif
20721
20722 PHDRS {
20723 text PT_LOAD FLAGS(5); /* R_E */
20724- data PT_LOAD FLAGS(7); /* RWE */
20725+#ifdef CONFIG_X86_32
20726+ module PT_LOAD FLAGS(5); /* R_E */
20727+#endif
20728+#ifdef CONFIG_XEN
20729+ rodata PT_LOAD FLAGS(5); /* R_E */
20730+#else
20731+ rodata PT_LOAD FLAGS(4); /* R__ */
20732+#endif
20733+ data PT_LOAD FLAGS(6); /* RW_ */
20734 #ifdef CONFIG_X86_64
20735 user PT_LOAD FLAGS(5); /* R_E */
20736+#endif
20737+ init.begin PT_LOAD FLAGS(6); /* RW_ */
20738 #ifdef CONFIG_SMP
20739 percpu PT_LOAD FLAGS(6); /* RW_ */
20740 #endif
20741+ text.init PT_LOAD FLAGS(5); /* R_E */
20742+ text.exit PT_LOAD FLAGS(5); /* R_E */
20743 init PT_LOAD FLAGS(7); /* RWE */
20744-#endif
20745 note PT_NOTE FLAGS(0); /* ___ */
20746 }
20747
20748 SECTIONS
20749 {
20750 #ifdef CONFIG_X86_32
20751- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
20752- phys_startup_32 = startup_32 - LOAD_OFFSET;
20753+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
20754 #else
20755- . = __START_KERNEL;
20756- phys_startup_64 = startup_64 - LOAD_OFFSET;
20757+ . = __START_KERNEL;
20758 #endif
20759
20760 /* Text and read-only data */
20761- .text : AT(ADDR(.text) - LOAD_OFFSET) {
20762- _text = .;
20763+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
20764 /* bootstrapping code */
20765+#ifdef CONFIG_X86_32
20766+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
20767+#else
20768+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
20769+#endif
20770+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
20771+ _text = .;
20772 HEAD_TEXT
20773 #ifdef CONFIG_X86_32
20774 . = ALIGN(PAGE_SIZE);
20775@@ -82,28 +102,71 @@ SECTIONS
20776 IRQENTRY_TEXT
20777 *(.fixup)
20778 *(.gnu.warning)
20779- /* End of text section */
20780- _etext = .;
20781 } :text = 0x9090
20782
20783- NOTES :text :note
20784+ . += __KERNEL_TEXT_OFFSET;
20785
20786- EXCEPTION_TABLE(16) :text = 0x9090
20787+#ifdef CONFIG_X86_32
20788+ . = ALIGN(PAGE_SIZE);
20789+ .vmi.rom : AT(ADDR(.vmi.rom) - LOAD_OFFSET) {
20790+ *(.vmi.rom)
20791+ } :module
20792+
20793+ . = ALIGN(PAGE_SIZE);
20794+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
20795+
20796+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
20797+ MODULES_EXEC_VADDR = .;
20798+ BYTE(0)
20799+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
20800+ . = ALIGN(HPAGE_SIZE);
20801+ MODULES_EXEC_END = . - 1;
20802+#endif
20803+
20804+ } :module
20805+#endif
20806+
20807+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
20808+ /* End of text section */
20809+ _etext = . - __KERNEL_TEXT_OFFSET;
20810+ }
20811+
20812+#ifdef CONFIG_X86_32
20813+ . = ALIGN(PAGE_SIZE);
20814+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
20815+ *(.idt)
20816+ . = ALIGN(PAGE_SIZE);
20817+ *(.empty_zero_page)
20818+ *(.swapper_pg_fixmap)
20819+ *(.swapper_pg_pmd)
20820+ *(.swapper_pg_dir)
20821+ *(.trampoline_pg_dir)
20822+ } :rodata
20823+#endif
20824+
20825+ . = ALIGN(PAGE_SIZE);
20826+ NOTES :rodata :note
20827+
20828+ EXCEPTION_TABLE(16) :rodata
20829
20830 RO_DATA(PAGE_SIZE)
20831
20832 /* Data */
20833 .data : AT(ADDR(.data) - LOAD_OFFSET) {
20834+
20835+#ifdef CONFIG_PAX_KERNEXEC
20836+ . = ALIGN(HPAGE_SIZE);
20837+#else
20838+ . = ALIGN(PAGE_SIZE);
20839+#endif
20840+
20841 /* Start of data section */
20842 _sdata = .;
20843
20844 /* init_task */
20845 INIT_TASK_DATA(THREAD_SIZE)
20846
20847-#ifdef CONFIG_X86_32
20848- /* 32 bit has nosave before _edata */
20849 NOSAVE_DATA
20850-#endif
20851
20852 PAGE_ALIGNED_DATA(PAGE_SIZE)
20853
20854@@ -112,6 +175,8 @@ SECTIONS
20855 DATA_DATA
20856 CONSTRUCTORS
20857
20858+ jiffies = jiffies_64;
20859+
20860 /* rarely changed data like cpu maps */
20861 READ_MOSTLY_DATA(CONFIG_X86_INTERNODE_CACHE_BYTES)
20862
20863@@ -166,12 +231,6 @@ SECTIONS
20864 }
20865 vgetcpu_mode = VVIRT(.vgetcpu_mode);
20866
20867- . = ALIGN(CONFIG_X86_L1_CACHE_BYTES);
20868- .jiffies : AT(VLOAD(.jiffies)) {
20869- *(.jiffies)
20870- }
20871- jiffies = VVIRT(.jiffies);
20872-
20873 .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
20874 *(.vsyscall_3)
20875 }
20876@@ -187,12 +246,19 @@ SECTIONS
20877 #endif /* CONFIG_X86_64 */
20878
20879 /* Init code and data - will be freed after init */
20880- . = ALIGN(PAGE_SIZE);
20881 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
20882+ BYTE(0)
20883+
20884+#ifdef CONFIG_PAX_KERNEXEC
20885+ . = ALIGN(HPAGE_SIZE);
20886+#else
20887+ . = ALIGN(PAGE_SIZE);
20888+#endif
20889+
20890 __init_begin = .; /* paired with __init_end */
20891- }
20892+ } :init.begin
20893
20894-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
20895+#ifdef CONFIG_SMP
20896 /*
20897 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
20898 * output PHDR, so the next output section - .init.text - should
20899@@ -201,12 +267,27 @@ SECTIONS
20900 PERCPU_VADDR(0, :percpu)
20901 #endif
20902
20903- INIT_TEXT_SECTION(PAGE_SIZE)
20904-#ifdef CONFIG_X86_64
20905- :init
20906-#endif
20907+ . = ALIGN(PAGE_SIZE);
20908+ init_begin = .;
20909+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
20910+ VMLINUX_SYMBOL(_sinittext) = .;
20911+ INIT_TEXT
20912+ VMLINUX_SYMBOL(_einittext) = .;
20913+ . = ALIGN(PAGE_SIZE);
20914+ } :text.init
20915
20916- INIT_DATA_SECTION(16)
20917+ /*
20918+ * .exit.text is discard at runtime, not link time, to deal with
20919+ * references from .altinstructions and .eh_frame
20920+ */
20921+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
20922+ EXIT_TEXT
20923+ . = ALIGN(16);
20924+ } :text.exit
20925+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
20926+
20927+ . = ALIGN(PAGE_SIZE);
20928+ INIT_DATA_SECTION(16) :init
20929
20930 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
20931 __x86_cpu_dev_start = .;
20932@@ -232,19 +313,11 @@ SECTIONS
20933 *(.altinstr_replacement)
20934 }
20935
20936- /*
20937- * .exit.text is discard at runtime, not link time, to deal with
20938- * references from .altinstructions and .eh_frame
20939- */
20940- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
20941- EXIT_TEXT
20942- }
20943-
20944 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
20945 EXIT_DATA
20946 }
20947
20948-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
20949+#ifndef CONFIG_SMP
20950 PERCPU(PAGE_SIZE)
20951 #endif
20952
20953@@ -267,12 +340,6 @@ SECTIONS
20954 . = ALIGN(PAGE_SIZE);
20955 }
20956
20957-#ifdef CONFIG_X86_64
20958- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
20959- NOSAVE_DATA
20960- }
20961-#endif
20962-
20963 /* BSS */
20964 . = ALIGN(PAGE_SIZE);
20965 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
20966@@ -288,6 +355,7 @@ SECTIONS
20967 __brk_base = .;
20968 . += 64 * 1024; /* 64k alignment slop space */
20969 *(.brk_reservation) /* areas brk users have reserved */
20970+ . = ALIGN(HPAGE_SIZE);
20971 __brk_limit = .;
20972 }
20973
20974@@ -316,13 +384,12 @@ SECTIONS
20975 * for the boot processor.
20976 */
20977 #define INIT_PER_CPU(x) init_per_cpu__##x = per_cpu__##x + __per_cpu_load
20978-INIT_PER_CPU(gdt_page);
20979 INIT_PER_CPU(irq_stack_union);
20980
20981 /*
20982 * Build-time check on the image size:
20983 */
20984-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
20985+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
20986 "kernel image bigger than KERNEL_IMAGE_SIZE");
20987
20988 #ifdef CONFIG_SMP
20989diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
20990index 62f39d7..3bc46a1 100644
20991--- a/arch/x86/kernel/vsyscall_64.c
20992+++ b/arch/x86/kernel/vsyscall_64.c
20993@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,
20994
20995 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
20996 /* copy vsyscall data */
20997+ strlcpy(vsyscall_gtod_data.clock.name, clock->name, sizeof vsyscall_gtod_data.clock.name);
20998 vsyscall_gtod_data.clock.vread = clock->vread;
20999 vsyscall_gtod_data.clock.cycle_last = clock->cycle_last;
21000 vsyscall_gtod_data.clock.mask = clock->mask;
21001@@ -203,7 +204,7 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache)
21002 We do this here because otherwise user space would do it on
21003 its own in a likely inferior way (no access to jiffies).
21004 If you don't like it pass NULL. */
21005- if (tcache && tcache->blob[0] == (j = __jiffies)) {
21006+ if (tcache && tcache->blob[0] == (j = jiffies)) {
21007 p = tcache->blob[1];
21008 } else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
21009 /* Load per CPU data from RDTSCP */
21010diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
21011index 3909e3b..5433a97 100644
21012--- a/arch/x86/kernel/x8664_ksyms_64.c
21013+++ b/arch/x86/kernel/x8664_ksyms_64.c
21014@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
21015
21016 EXPORT_SYMBOL(copy_user_generic);
21017 EXPORT_SYMBOL(__copy_user_nocache);
21018-EXPORT_SYMBOL(copy_from_user);
21019-EXPORT_SYMBOL(copy_to_user);
21020 EXPORT_SYMBOL(__copy_from_user_inatomic);
21021
21022 EXPORT_SYMBOL(copy_page);
21023diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
21024index c5ee17e..d63218f 100644
21025--- a/arch/x86/kernel/xsave.c
21026+++ b/arch/x86/kernel/xsave.c
21027@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
21028 fx_sw_user->xstate_size > fx_sw_user->extended_size)
21029 return -1;
21030
21031- err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
21032+ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
21033 fx_sw_user->extended_size -
21034 FP_XSTATE_MAGIC2_SIZE));
21035 /*
21036@@ -196,7 +196,7 @@ fx_only:
21037 * the other extended state.
21038 */
21039 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
21040- return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
21041+ return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
21042 }
21043
21044 /*
21045@@ -228,7 +228,7 @@ int restore_i387_xstate(void __user *buf)
21046 if (task_thread_info(tsk)->status & TS_XSAVE)
21047 err = restore_user_xstate(buf);
21048 else
21049- err = fxrstor_checking((__force struct i387_fxsave_struct *)
21050+ err = fxrstor_checking((struct i387_fxsave_struct __user *)
21051 buf);
21052 if (unlikely(err)) {
21053 /*
21054diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
21055index 1350e43..a94b011 100644
21056--- a/arch/x86/kvm/emulate.c
21057+++ b/arch/x86/kvm/emulate.c
21058@@ -81,8 +81,8 @@
21059 #define Src2CL (1<<29)
21060 #define Src2ImmByte (2<<29)
21061 #define Src2One (3<<29)
21062-#define Src2Imm16 (4<<29)
21063-#define Src2Mask (7<<29)
21064+#define Src2Imm16 (4U<<29)
21065+#define Src2Mask (7U<<29)
21066
21067 enum {
21068 Group1_80, Group1_81, Group1_82, Group1_83,
21069@@ -411,6 +411,7 @@ static u32 group2_table[] = {
21070
21071 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \
21072 do { \
21073+ unsigned long _tmp; \
21074 __asm__ __volatile__ ( \
21075 _PRE_EFLAGS("0", "4", "2") \
21076 _op _suffix " %"_x"3,%1; " \
21077@@ -424,8 +425,6 @@ static u32 group2_table[] = {
21078 /* Raw emulation: instruction has two explicit operands. */
21079 #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
21080 do { \
21081- unsigned long _tmp; \
21082- \
21083 switch ((_dst).bytes) { \
21084 case 2: \
21085 ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \
21086@@ -441,7 +440,6 @@ static u32 group2_table[] = {
21087
21088 #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
21089 do { \
21090- unsigned long _tmp; \
21091 switch ((_dst).bytes) { \
21092 case 1: \
21093 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
21094diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
21095index 8dfeaaa..4daa395 100644
21096--- a/arch/x86/kvm/lapic.c
21097+++ b/arch/x86/kvm/lapic.c
21098@@ -52,7 +52,7 @@
21099 #define APIC_BUS_CYCLE_NS 1
21100
21101 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
21102-#define apic_debug(fmt, arg...)
21103+#define apic_debug(fmt, arg...) do {} while (0)
21104
21105 #define APIC_LVT_NUM 6
21106 /* 14 is the version for Xeon and Pentium 8.4.8*/
21107diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
21108index 3bc2707..dd157e2 100644
21109--- a/arch/x86/kvm/paging_tmpl.h
21110+++ b/arch/x86/kvm/paging_tmpl.h
21111@@ -416,6 +416,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,
21112 int level = PT_PAGE_TABLE_LEVEL;
21113 unsigned long mmu_seq;
21114
21115+ pax_track_stack();
21116+
21117 pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code);
21118 kvm_mmu_audit(vcpu, "pre page fault");
21119
21120@@ -461,6 +463,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,
21121 kvm_mmu_free_some_pages(vcpu);
21122 sptep = FNAME(fetch)(vcpu, addr, &walker, user_fault, write_fault,
21123 level, &write_pt, pfn);
21124+ (void)sptep;
21125 pgprintk("%s: shadow pte %p %llx ptwrite %d\n", __func__,
21126 sptep, *sptep, write_pt);
21127
21128diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
21129index 7c6e63e..c5d92c1 100644
21130--- a/arch/x86/kvm/svm.c
21131+++ b/arch/x86/kvm/svm.c
21132@@ -2486,7 +2486,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
21133 int cpu = raw_smp_processor_id();
21134
21135 struct svm_cpu_data *svm_data = per_cpu(svm_data, cpu);
21136+
21137+ pax_open_kernel();
21138 svm_data->tss_desc->type = 9; /* available 32/64-bit TSS */
21139+ pax_close_kernel();
21140+
21141 load_TR_desc();
21142 }
21143
21144@@ -2947,7 +2951,7 @@ static bool svm_gb_page_enable(void)
21145 return true;
21146 }
21147
21148-static struct kvm_x86_ops svm_x86_ops = {
21149+static const struct kvm_x86_ops svm_x86_ops = {
21150 .cpu_has_kvm_support = has_svm,
21151 .disabled_by_bios = is_disabled,
21152 .hardware_setup = svm_hardware_setup,
21153diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
21154index e6d925f..e7a4af8 100644
21155--- a/arch/x86/kvm/vmx.c
21156+++ b/arch/x86/kvm/vmx.c
21157@@ -570,7 +570,11 @@ static void reload_tss(void)
21158
21159 kvm_get_gdt(&gdt);
21160 descs = (void *)gdt.base;
21161+
21162+ pax_open_kernel();
21163 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
21164+ pax_close_kernel();
21165+
21166 load_TR_desc();
21167 }
21168
21169@@ -1410,8 +1414,11 @@ static __init int hardware_setup(void)
21170 if (!cpu_has_vmx_flexpriority())
21171 flexpriority_enabled = 0;
21172
21173- if (!cpu_has_vmx_tpr_shadow())
21174- kvm_x86_ops->update_cr8_intercept = NULL;
21175+ if (!cpu_has_vmx_tpr_shadow()) {
21176+ pax_open_kernel();
21177+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
21178+ pax_close_kernel();
21179+ }
21180
21181 if (enable_ept && !cpu_has_vmx_ept_2m_page())
21182 kvm_disable_largepages();
21183@@ -2362,7 +2369,7 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
21184 vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */
21185
21186 asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));
21187- vmcs_writel(HOST_RIP, kvm_vmx_return); /* 22.2.5 */
21188+ vmcs_writel(HOST_RIP, ktla_ktva(kvm_vmx_return)); /* 22.2.5 */
21189 vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);
21190 vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0);
21191 vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0);
21192@@ -3718,6 +3725,12 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
21193 "jmp .Lkvm_vmx_return \n\t"
21194 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
21195 ".Lkvm_vmx_return: "
21196+
21197+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
21198+ "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
21199+ ".Lkvm_vmx_return2: "
21200+#endif
21201+
21202 /* Save guest registers, load host registers, keep flags */
21203 "xchg %0, (%%"R"sp) \n\t"
21204 "mov %%"R"ax, %c[rax](%0) \n\t"
21205@@ -3764,8 +3777,13 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
21206 [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
21207 #endif
21208 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
21209+
21210+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
21211+ ,[cs]"i"(__KERNEL_CS)
21212+#endif
21213+
21214 : "cc", "memory"
21215- , R"bx", R"di", R"si"
21216+ , R"ax", R"bx", R"di", R"si"
21217 #ifdef CONFIG_X86_64
21218 , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
21219 #endif
21220@@ -3782,7 +3800,16 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
21221 if (vmx->rmode.irq.pending)
21222 fixup_rmode_irq(vmx);
21223
21224- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
21225+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
21226+
21227+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
21228+ loadsegment(fs, __KERNEL_PERCPU);
21229+#endif
21230+
21231+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
21232+ __set_fs(current_thread_info()->addr_limit);
21233+#endif
21234+
21235 vmx->launched = 1;
21236
21237 vmx_complete_interrupts(vmx);
21238@@ -3957,7 +3984,7 @@ static bool vmx_gb_page_enable(void)
21239 return false;
21240 }
21241
21242-static struct kvm_x86_ops vmx_x86_ops = {
21243+static const struct kvm_x86_ops vmx_x86_ops = {
21244 .cpu_has_kvm_support = cpu_has_kvm_support,
21245 .disabled_by_bios = vmx_disabled_by_bios,
21246 .hardware_setup = hardware_setup,
21247diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
21248index df1cefb..5e882ad 100644
21249--- a/arch/x86/kvm/x86.c
21250+++ b/arch/x86/kvm/x86.c
21251@@ -82,7 +82,7 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu);
21252 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
21253 struct kvm_cpuid_entry2 __user *entries);
21254
21255-struct kvm_x86_ops *kvm_x86_ops;
21256+const struct kvm_x86_ops *kvm_x86_ops;
21257 EXPORT_SYMBOL_GPL(kvm_x86_ops);
21258
21259 int ignore_msrs = 0;
21260@@ -1430,15 +1430,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
21261 struct kvm_cpuid2 *cpuid,
21262 struct kvm_cpuid_entry2 __user *entries)
21263 {
21264- int r;
21265+ int r, i;
21266
21267 r = -E2BIG;
21268 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
21269 goto out;
21270 r = -EFAULT;
21271- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
21272- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
21273+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
21274 goto out;
21275+ for (i = 0; i < cpuid->nent; ++i) {
21276+ struct kvm_cpuid_entry2 cpuid_entry;
21277+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
21278+ goto out;
21279+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
21280+ }
21281 vcpu->arch.cpuid_nent = cpuid->nent;
21282 kvm_apic_set_version(vcpu);
21283 return 0;
21284@@ -1451,16 +1456,20 @@ static int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
21285 struct kvm_cpuid2 *cpuid,
21286 struct kvm_cpuid_entry2 __user *entries)
21287 {
21288- int r;
21289+ int r, i;
21290
21291 vcpu_load(vcpu);
21292 r = -E2BIG;
21293 if (cpuid->nent < vcpu->arch.cpuid_nent)
21294 goto out;
21295 r = -EFAULT;
21296- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
21297- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
21298+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
21299 goto out;
21300+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
21301+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
21302+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
21303+ goto out;
21304+ }
21305 return 0;
21306
21307 out:
21308@@ -1678,7 +1687,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
21309 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
21310 struct kvm_interrupt *irq)
21311 {
21312- if (irq->irq < 0 || irq->irq >= 256)
21313+ if (irq->irq >= 256)
21314 return -EINVAL;
21315 if (irqchip_in_kernel(vcpu->kvm))
21316 return -ENXIO;
21317@@ -3260,10 +3269,10 @@ static struct notifier_block kvmclock_cpufreq_notifier_block = {
21318 .notifier_call = kvmclock_cpufreq_notifier
21319 };
21320
21321-int kvm_arch_init(void *opaque)
21322+int kvm_arch_init(const void *opaque)
21323 {
21324 int r, cpu;
21325- struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
21326+ const struct kvm_x86_ops *ops = (const struct kvm_x86_ops *)opaque;
21327
21328 if (kvm_x86_ops) {
21329 printk(KERN_ERR "kvm: already loaded the other module\n");
21330diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
21331index 7e59dc1..b88c98f 100644
21332--- a/arch/x86/lguest/boot.c
21333+++ b/arch/x86/lguest/boot.c
21334@@ -1172,9 +1172,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
21335 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
21336 * Launcher to reboot us.
21337 */
21338-static void lguest_restart(char *reason)
21339+static __noreturn void lguest_restart(char *reason)
21340 {
21341 kvm_hypercall2(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART);
21342+ BUG();
21343 }
21344
21345 /*G:050
21346diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
21347index 824fa0b..c619e96 100644
21348--- a/arch/x86/lib/atomic64_32.c
21349+++ b/arch/x86/lib/atomic64_32.c
21350@@ -25,6 +25,12 @@ u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val)
21351 }
21352 EXPORT_SYMBOL(atomic64_cmpxchg);
21353
21354+u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old_val, u64 new_val)
21355+{
21356+ return cmpxchg8b(&ptr->counter, old_val, new_val);
21357+}
21358+EXPORT_SYMBOL(atomic64_cmpxchg_unchecked);
21359+
21360 /**
21361 * atomic64_xchg - xchg atomic64 variable
21362 * @ptr: pointer to type atomic64_t
21363@@ -56,6 +62,36 @@ u64 atomic64_xchg(atomic64_t *ptr, u64 new_val)
21364 EXPORT_SYMBOL(atomic64_xchg);
21365
21366 /**
21367+ * atomic64_xchg_unchecked - xchg atomic64 variable
21368+ * @ptr: pointer to type atomic64_unchecked_t
21369+ * @new_val: value to assign
21370+ *
21371+ * Atomically xchgs the value of @ptr to @new_val and returns
21372+ * the old value.
21373+ */
21374+u64 atomic64_xchg_unchecked(atomic64_unchecked_t *ptr, u64 new_val)
21375+{
21376+ /*
21377+ * Try first with a (possibly incorrect) assumption about
21378+ * what we have there. We'll do two loops most likely,
21379+ * but we'll get an ownership MESI transaction straight away
21380+ * instead of a read transaction followed by a
21381+ * flush-for-ownership transaction:
21382+ */
21383+ u64 old_val, real_val = 0;
21384+
21385+ do {
21386+ old_val = real_val;
21387+
21388+ real_val = atomic64_cmpxchg_unchecked(ptr, old_val, new_val);
21389+
21390+ } while (real_val != old_val);
21391+
21392+ return old_val;
21393+}
21394+EXPORT_SYMBOL(atomic64_xchg_unchecked);
21395+
21396+/**
21397 * atomic64_set - set atomic64 variable
21398 * @ptr: pointer to type atomic64_t
21399 * @new_val: value to assign
21400@@ -69,7 +105,19 @@ void atomic64_set(atomic64_t *ptr, u64 new_val)
21401 EXPORT_SYMBOL(atomic64_set);
21402
21403 /**
21404-EXPORT_SYMBOL(atomic64_read);
21405+ * atomic64_unchecked_set - set atomic64 variable
21406+ * @ptr: pointer to type atomic64_unchecked_t
21407+ * @new_val: value to assign
21408+ *
21409+ * Atomically sets the value of @ptr to @new_val.
21410+ */
21411+void atomic64_set_unchecked(atomic64_unchecked_t *ptr, u64 new_val)
21412+{
21413+ atomic64_xchg_unchecked(ptr, new_val);
21414+}
21415+EXPORT_SYMBOL(atomic64_set_unchecked);
21416+
21417+/**
21418 * atomic64_add_return - add and return
21419 * @delta: integer value to add
21420 * @ptr: pointer to type atomic64_t
21421@@ -99,24 +147,72 @@ noinline u64 atomic64_add_return(u64 delta, atomic64_t *ptr)
21422 }
21423 EXPORT_SYMBOL(atomic64_add_return);
21424
21425+/**
21426+ * atomic64_add_return_unchecked - add and return
21427+ * @delta: integer value to add
21428+ * @ptr: pointer to type atomic64_unchecked_t
21429+ *
21430+ * Atomically adds @delta to @ptr and returns @delta + *@ptr
21431+ */
21432+noinline u64 atomic64_add_return_unchecked(u64 delta, atomic64_unchecked_t *ptr)
21433+{
21434+ /*
21435+ * Try first with a (possibly incorrect) assumption about
21436+ * what we have there. We'll do two loops most likely,
21437+ * but we'll get an ownership MESI transaction straight away
21438+ * instead of a read transaction followed by a
21439+ * flush-for-ownership transaction:
21440+ */
21441+ u64 old_val, new_val, real_val = 0;
21442+
21443+ do {
21444+ old_val = real_val;
21445+ new_val = old_val + delta;
21446+
21447+ real_val = atomic64_cmpxchg_unchecked(ptr, old_val, new_val);
21448+
21449+ } while (real_val != old_val);
21450+
21451+ return new_val;
21452+}
21453+EXPORT_SYMBOL(atomic64_add_return_unchecked);
21454+
21455 u64 atomic64_sub_return(u64 delta, atomic64_t *ptr)
21456 {
21457 return atomic64_add_return(-delta, ptr);
21458 }
21459 EXPORT_SYMBOL(atomic64_sub_return);
21460
21461+u64 atomic64_sub_return_unchecked(u64 delta, atomic64_unchecked_t *ptr)
21462+{
21463+ return atomic64_add_return_unchecked(-delta, ptr);
21464+}
21465+EXPORT_SYMBOL(atomic64_sub_return_unchecked);
21466+
21467 u64 atomic64_inc_return(atomic64_t *ptr)
21468 {
21469 return atomic64_add_return(1, ptr);
21470 }
21471 EXPORT_SYMBOL(atomic64_inc_return);
21472
21473+u64 atomic64_inc_return_unchecked(atomic64_unchecked_t *ptr)
21474+{
21475+ return atomic64_add_return_unchecked(1, ptr);
21476+}
21477+EXPORT_SYMBOL(atomic64_inc_return_unchecked);
21478+
21479 u64 atomic64_dec_return(atomic64_t *ptr)
21480 {
21481 return atomic64_sub_return(1, ptr);
21482 }
21483 EXPORT_SYMBOL(atomic64_dec_return);
21484
21485+u64 atomic64_dec_return_unchecked(atomic64_unchecked_t *ptr)
21486+{
21487+ return atomic64_sub_return_unchecked(1, ptr);
21488+}
21489+EXPORT_SYMBOL(atomic64_dec_return_unchecked);
21490+
21491 /**
21492 * atomic64_add - add integer to atomic64 variable
21493 * @delta: integer value to add
21494@@ -131,6 +227,19 @@ void atomic64_add(u64 delta, atomic64_t *ptr)
21495 EXPORT_SYMBOL(atomic64_add);
21496
21497 /**
21498+ * atomic64_add_unchecked - add integer to atomic64 variable
21499+ * @delta: integer value to add
21500+ * @ptr: pointer to type atomic64_unchecked_t
21501+ *
21502+ * Atomically adds @delta to @ptr.
21503+ */
21504+void atomic64_add_unchecked(u64 delta, atomic64_unchecked_t *ptr)
21505+{
21506+ atomic64_add_return_unchecked(delta, ptr);
21507+}
21508+EXPORT_SYMBOL(atomic64_add_unchecked);
21509+
21510+/**
21511 * atomic64_sub - subtract the atomic64 variable
21512 * @delta: integer value to subtract
21513 * @ptr: pointer to type atomic64_t
21514@@ -144,6 +253,19 @@ void atomic64_sub(u64 delta, atomic64_t *ptr)
21515 EXPORT_SYMBOL(atomic64_sub);
21516
21517 /**
21518+ * atomic64_sub_unchecked - subtract the atomic64 variable
21519+ * @delta: integer value to subtract
21520+ * @ptr: pointer to type atomic64_unchecked_t
21521+ *
21522+ * Atomically subtracts @delta from @ptr.
21523+ */
21524+void atomic64_sub_unchecked(u64 delta, atomic64_unchecked_t *ptr)
21525+{
21526+ atomic64_add_unchecked(-delta, ptr);
21527+}
21528+EXPORT_SYMBOL(atomic64_sub_unchecked);
21529+
21530+/**
21531 * atomic64_sub_and_test - subtract value from variable and test result
21532 * @delta: integer value to subtract
21533 * @ptr: pointer to type atomic64_t
21534@@ -173,6 +295,18 @@ void atomic64_inc(atomic64_t *ptr)
21535 EXPORT_SYMBOL(atomic64_inc);
21536
21537 /**
21538+ * atomic64_inc_unchecked - increment atomic64 variable
21539+ * @ptr: pointer to type atomic64_unchecked_t
21540+ *
21541+ * Atomically increments @ptr by 1.
21542+ */
21543+void atomic64_inc_unchecked(atomic64_unchecked_t *ptr)
21544+{
21545+ atomic64_add_unchecked(1, ptr);
21546+}
21547+EXPORT_SYMBOL(atomic64_inc_unchecked);
21548+
21549+/**
21550 * atomic64_dec - decrement atomic64 variable
21551 * @ptr: pointer to type atomic64_t
21552 *
21553@@ -185,6 +319,18 @@ void atomic64_dec(atomic64_t *ptr)
21554 EXPORT_SYMBOL(atomic64_dec);
21555
21556 /**
21557+ * atomic64_dec_unchecked - decrement atomic64 variable
21558+ * @ptr: pointer to type atomic64_unchecked_t
21559+ *
21560+ * Atomically decrements @ptr by 1.
21561+ */
21562+void atomic64_dec_unchecked(atomic64_unchecked_t *ptr)
21563+{
21564+ atomic64_sub_unchecked(1, ptr);
21565+}
21566+EXPORT_SYMBOL(atomic64_dec_unchecked);
21567+
21568+/**
21569 * atomic64_dec_and_test - decrement and test
21570 * @ptr: pointer to type atomic64_t
21571 *
21572diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
21573index adbccd0..98f96c8 100644
21574--- a/arch/x86/lib/checksum_32.S
21575+++ b/arch/x86/lib/checksum_32.S
21576@@ -28,7 +28,8 @@
21577 #include <linux/linkage.h>
21578 #include <asm/dwarf2.h>
21579 #include <asm/errno.h>
21580-
21581+#include <asm/segment.h>
21582+
21583 /*
21584 * computes a partial checksum, e.g. for TCP/UDP fragments
21585 */
21586@@ -304,9 +305,28 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
21587
21588 #define ARGBASE 16
21589 #define FP 12
21590-
21591-ENTRY(csum_partial_copy_generic)
21592+
21593+ENTRY(csum_partial_copy_generic_to_user)
21594 CFI_STARTPROC
21595+
21596+#ifdef CONFIG_PAX_MEMORY_UDEREF
21597+ pushl %gs
21598+ CFI_ADJUST_CFA_OFFSET 4
21599+ popl %es
21600+ CFI_ADJUST_CFA_OFFSET -4
21601+ jmp csum_partial_copy_generic
21602+#endif
21603+
21604+ENTRY(csum_partial_copy_generic_from_user)
21605+
21606+#ifdef CONFIG_PAX_MEMORY_UDEREF
21607+ pushl %gs
21608+ CFI_ADJUST_CFA_OFFSET 4
21609+ popl %ds
21610+ CFI_ADJUST_CFA_OFFSET -4
21611+#endif
21612+
21613+ENTRY(csum_partial_copy_generic)
21614 subl $4,%esp
21615 CFI_ADJUST_CFA_OFFSET 4
21616 pushl %edi
21617@@ -331,7 +351,7 @@ ENTRY(csum_partial_copy_generic)
21618 jmp 4f
21619 SRC(1: movw (%esi), %bx )
21620 addl $2, %esi
21621-DST( movw %bx, (%edi) )
21622+DST( movw %bx, %es:(%edi) )
21623 addl $2, %edi
21624 addw %bx, %ax
21625 adcl $0, %eax
21626@@ -343,30 +363,30 @@ DST( movw %bx, (%edi) )
21627 SRC(1: movl (%esi), %ebx )
21628 SRC( movl 4(%esi), %edx )
21629 adcl %ebx, %eax
21630-DST( movl %ebx, (%edi) )
21631+DST( movl %ebx, %es:(%edi) )
21632 adcl %edx, %eax
21633-DST( movl %edx, 4(%edi) )
21634+DST( movl %edx, %es:4(%edi) )
21635
21636 SRC( movl 8(%esi), %ebx )
21637 SRC( movl 12(%esi), %edx )
21638 adcl %ebx, %eax
21639-DST( movl %ebx, 8(%edi) )
21640+DST( movl %ebx, %es:8(%edi) )
21641 adcl %edx, %eax
21642-DST( movl %edx, 12(%edi) )
21643+DST( movl %edx, %es:12(%edi) )
21644
21645 SRC( movl 16(%esi), %ebx )
21646 SRC( movl 20(%esi), %edx )
21647 adcl %ebx, %eax
21648-DST( movl %ebx, 16(%edi) )
21649+DST( movl %ebx, %es:16(%edi) )
21650 adcl %edx, %eax
21651-DST( movl %edx, 20(%edi) )
21652+DST( movl %edx, %es:20(%edi) )
21653
21654 SRC( movl 24(%esi), %ebx )
21655 SRC( movl 28(%esi), %edx )
21656 adcl %ebx, %eax
21657-DST( movl %ebx, 24(%edi) )
21658+DST( movl %ebx, %es:24(%edi) )
21659 adcl %edx, %eax
21660-DST( movl %edx, 28(%edi) )
21661+DST( movl %edx, %es:28(%edi) )
21662
21663 lea 32(%esi), %esi
21664 lea 32(%edi), %edi
21665@@ -380,7 +400,7 @@ DST( movl %edx, 28(%edi) )
21666 shrl $2, %edx # This clears CF
21667 SRC(3: movl (%esi), %ebx )
21668 adcl %ebx, %eax
21669-DST( movl %ebx, (%edi) )
21670+DST( movl %ebx, %es:(%edi) )
21671 lea 4(%esi), %esi
21672 lea 4(%edi), %edi
21673 dec %edx
21674@@ -392,12 +412,12 @@ DST( movl %ebx, (%edi) )
21675 jb 5f
21676 SRC( movw (%esi), %cx )
21677 leal 2(%esi), %esi
21678-DST( movw %cx, (%edi) )
21679+DST( movw %cx, %es:(%edi) )
21680 leal 2(%edi), %edi
21681 je 6f
21682 shll $16,%ecx
21683 SRC(5: movb (%esi), %cl )
21684-DST( movb %cl, (%edi) )
21685+DST( movb %cl, %es:(%edi) )
21686 6: addl %ecx, %eax
21687 adcl $0, %eax
21688 7:
21689@@ -408,7 +428,7 @@ DST( movb %cl, (%edi) )
21690
21691 6001:
21692 movl ARGBASE+20(%esp), %ebx # src_err_ptr
21693- movl $-EFAULT, (%ebx)
21694+ movl $-EFAULT, %ss:(%ebx)
21695
21696 # zero the complete destination - computing the rest
21697 # is too much work
21698@@ -421,11 +441,19 @@ DST( movb %cl, (%edi) )
21699
21700 6002:
21701 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21702- movl $-EFAULT,(%ebx)
21703+ movl $-EFAULT,%ss:(%ebx)
21704 jmp 5000b
21705
21706 .previous
21707
21708+ pushl %ss
21709+ CFI_ADJUST_CFA_OFFSET 4
21710+ popl %ds
21711+ CFI_ADJUST_CFA_OFFSET -4
21712+ pushl %ss
21713+ CFI_ADJUST_CFA_OFFSET 4
21714+ popl %es
21715+ CFI_ADJUST_CFA_OFFSET -4
21716 popl %ebx
21717 CFI_ADJUST_CFA_OFFSET -4
21718 CFI_RESTORE ebx
21719@@ -439,26 +467,47 @@ DST( movb %cl, (%edi) )
21720 CFI_ADJUST_CFA_OFFSET -4
21721 ret
21722 CFI_ENDPROC
21723-ENDPROC(csum_partial_copy_generic)
21724+ENDPROC(csum_partial_copy_generic_to_user)
21725
21726 #else
21727
21728 /* Version for PentiumII/PPro */
21729
21730 #define ROUND1(x) \
21731+ nop; nop; nop; \
21732 SRC(movl x(%esi), %ebx ) ; \
21733 addl %ebx, %eax ; \
21734- DST(movl %ebx, x(%edi) ) ;
21735+ DST(movl %ebx, %es:x(%edi)) ;
21736
21737 #define ROUND(x) \
21738+ nop; nop; nop; \
21739 SRC(movl x(%esi), %ebx ) ; \
21740 adcl %ebx, %eax ; \
21741- DST(movl %ebx, x(%edi) ) ;
21742+ DST(movl %ebx, %es:x(%edi)) ;
21743
21744 #define ARGBASE 12
21745-
21746-ENTRY(csum_partial_copy_generic)
21747+
21748+ENTRY(csum_partial_copy_generic_to_user)
21749 CFI_STARTPROC
21750+
21751+#ifdef CONFIG_PAX_MEMORY_UDEREF
21752+ pushl %gs
21753+ CFI_ADJUST_CFA_OFFSET 4
21754+ popl %es
21755+ CFI_ADJUST_CFA_OFFSET -4
21756+ jmp csum_partial_copy_generic
21757+#endif
21758+
21759+ENTRY(csum_partial_copy_generic_from_user)
21760+
21761+#ifdef CONFIG_PAX_MEMORY_UDEREF
21762+ pushl %gs
21763+ CFI_ADJUST_CFA_OFFSET 4
21764+ popl %ds
21765+ CFI_ADJUST_CFA_OFFSET -4
21766+#endif
21767+
21768+ENTRY(csum_partial_copy_generic)
21769 pushl %ebx
21770 CFI_ADJUST_CFA_OFFSET 4
21771 CFI_REL_OFFSET ebx, 0
21772@@ -482,7 +531,7 @@ ENTRY(csum_partial_copy_generic)
21773 subl %ebx, %edi
21774 lea -1(%esi),%edx
21775 andl $-32,%edx
21776- lea 3f(%ebx,%ebx), %ebx
21777+ lea 3f(%ebx,%ebx,2), %ebx
21778 testl %esi, %esi
21779 jmp *%ebx
21780 1: addl $64,%esi
21781@@ -503,19 +552,19 @@ ENTRY(csum_partial_copy_generic)
21782 jb 5f
21783 SRC( movw (%esi), %dx )
21784 leal 2(%esi), %esi
21785-DST( movw %dx, (%edi) )
21786+DST( movw %dx, %es:(%edi) )
21787 leal 2(%edi), %edi
21788 je 6f
21789 shll $16,%edx
21790 5:
21791 SRC( movb (%esi), %dl )
21792-DST( movb %dl, (%edi) )
21793+DST( movb %dl, %es:(%edi) )
21794 6: addl %edx, %eax
21795 adcl $0, %eax
21796 7:
21797 .section .fixup, "ax"
21798 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
21799- movl $-EFAULT, (%ebx)
21800+ movl $-EFAULT, %ss:(%ebx)
21801 # zero the complete destination (computing the rest is too much work)
21802 movl ARGBASE+8(%esp),%edi # dst
21803 movl ARGBASE+12(%esp),%ecx # len
21804@@ -523,10 +572,21 @@ DST( movb %dl, (%edi) )
21805 rep; stosb
21806 jmp 7b
21807 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21808- movl $-EFAULT, (%ebx)
21809+ movl $-EFAULT, %ss:(%ebx)
21810 jmp 7b
21811 .previous
21812
21813+#ifdef CONFIG_PAX_MEMORY_UDEREF
21814+ pushl %ss
21815+ CFI_ADJUST_CFA_OFFSET 4
21816+ popl %ds
21817+ CFI_ADJUST_CFA_OFFSET -4
21818+ pushl %ss
21819+ CFI_ADJUST_CFA_OFFSET 4
21820+ popl %es
21821+ CFI_ADJUST_CFA_OFFSET -4
21822+#endif
21823+
21824 popl %esi
21825 CFI_ADJUST_CFA_OFFSET -4
21826 CFI_RESTORE esi
21827@@ -538,7 +598,7 @@ DST( movb %dl, (%edi) )
21828 CFI_RESTORE ebx
21829 ret
21830 CFI_ENDPROC
21831-ENDPROC(csum_partial_copy_generic)
21832+ENDPROC(csum_partial_copy_generic_to_user)
21833
21834 #undef ROUND
21835 #undef ROUND1
21836diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
21837index ebeafcc..1e3a402 100644
21838--- a/arch/x86/lib/clear_page_64.S
21839+++ b/arch/x86/lib/clear_page_64.S
21840@@ -1,5 +1,6 @@
21841 #include <linux/linkage.h>
21842 #include <asm/dwarf2.h>
21843+#include <asm/alternative-asm.h>
21844
21845 /*
21846 * Zero a page.
21847@@ -10,6 +11,7 @@ ENTRY(clear_page_c)
21848 movl $4096/8,%ecx
21849 xorl %eax,%eax
21850 rep stosq
21851+ pax_force_retaddr
21852 ret
21853 CFI_ENDPROC
21854 ENDPROC(clear_page_c)
21855@@ -33,6 +35,7 @@ ENTRY(clear_page)
21856 leaq 64(%rdi),%rdi
21857 jnz .Lloop
21858 nop
21859+ pax_force_retaddr
21860 ret
21861 CFI_ENDPROC
21862 .Lclear_page_end:
21863@@ -43,7 +46,7 @@ ENDPROC(clear_page)
21864
21865 #include <asm/cpufeature.h>
21866
21867- .section .altinstr_replacement,"ax"
21868+ .section .altinstr_replacement,"a"
21869 1: .byte 0xeb /* jmp <disp8> */
21870 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
21871 2:
21872diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
21873index 727a5d4..333818a 100644
21874--- a/arch/x86/lib/copy_page_64.S
21875+++ b/arch/x86/lib/copy_page_64.S
21876@@ -2,12 +2,14 @@
21877
21878 #include <linux/linkage.h>
21879 #include <asm/dwarf2.h>
21880+#include <asm/alternative-asm.h>
21881
21882 ALIGN
21883 copy_page_c:
21884 CFI_STARTPROC
21885 movl $4096/8,%ecx
21886 rep movsq
21887+ pax_force_retaddr
21888 ret
21889 CFI_ENDPROC
21890 ENDPROC(copy_page_c)
21891@@ -38,7 +40,7 @@ ENTRY(copy_page)
21892 movq 16 (%rsi), %rdx
21893 movq 24 (%rsi), %r8
21894 movq 32 (%rsi), %r9
21895- movq 40 (%rsi), %r10
21896+ movq 40 (%rsi), %r13
21897 movq 48 (%rsi), %r11
21898 movq 56 (%rsi), %r12
21899
21900@@ -49,7 +51,7 @@ ENTRY(copy_page)
21901 movq %rdx, 16 (%rdi)
21902 movq %r8, 24 (%rdi)
21903 movq %r9, 32 (%rdi)
21904- movq %r10, 40 (%rdi)
21905+ movq %r13, 40 (%rdi)
21906 movq %r11, 48 (%rdi)
21907 movq %r12, 56 (%rdi)
21908
21909@@ -68,7 +70,7 @@ ENTRY(copy_page)
21910 movq 16 (%rsi), %rdx
21911 movq 24 (%rsi), %r8
21912 movq 32 (%rsi), %r9
21913- movq 40 (%rsi), %r10
21914+ movq 40 (%rsi), %r13
21915 movq 48 (%rsi), %r11
21916 movq 56 (%rsi), %r12
21917
21918@@ -77,7 +79,7 @@ ENTRY(copy_page)
21919 movq %rdx, 16 (%rdi)
21920 movq %r8, 24 (%rdi)
21921 movq %r9, 32 (%rdi)
21922- movq %r10, 40 (%rdi)
21923+ movq %r13, 40 (%rdi)
21924 movq %r11, 48 (%rdi)
21925 movq %r12, 56 (%rdi)
21926
21927@@ -94,6 +96,7 @@ ENTRY(copy_page)
21928 CFI_RESTORE r13
21929 addq $3*8,%rsp
21930 CFI_ADJUST_CFA_OFFSET -3*8
21931+ pax_force_retaddr
21932 ret
21933 .Lcopy_page_end:
21934 CFI_ENDPROC
21935@@ -104,7 +107,7 @@ ENDPROC(copy_page)
21936
21937 #include <asm/cpufeature.h>
21938
21939- .section .altinstr_replacement,"ax"
21940+ .section .altinstr_replacement,"a"
21941 1: .byte 0xeb /* jmp <disp8> */
21942 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
21943 2:
21944diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
21945index af8debd..40c75f3 100644
21946--- a/arch/x86/lib/copy_user_64.S
21947+++ b/arch/x86/lib/copy_user_64.S
21948@@ -15,13 +15,15 @@
21949 #include <asm/asm-offsets.h>
21950 #include <asm/thread_info.h>
21951 #include <asm/cpufeature.h>
21952+#include <asm/pgtable.h>
21953+#include <asm/alternative-asm.h>
21954
21955 .macro ALTERNATIVE_JUMP feature,orig,alt
21956 0:
21957 .byte 0xe9 /* 32bit jump */
21958 .long \orig-1f /* by default jump to orig */
21959 1:
21960- .section .altinstr_replacement,"ax"
21961+ .section .altinstr_replacement,"a"
21962 2: .byte 0xe9 /* near jump with 32bit immediate */
21963 .long \alt-1b /* offset */ /* or alternatively to alt */
21964 .previous
21965@@ -64,55 +66,26 @@
21966 #endif
21967 .endm
21968
21969-/* Standard copy_to_user with segment limit checking */
21970-ENTRY(copy_to_user)
21971- CFI_STARTPROC
21972- GET_THREAD_INFO(%rax)
21973- movq %rdi,%rcx
21974- addq %rdx,%rcx
21975- jc bad_to_user
21976- cmpq TI_addr_limit(%rax),%rcx
21977- ja bad_to_user
21978- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
21979- CFI_ENDPROC
21980-ENDPROC(copy_to_user)
21981-
21982-/* Standard copy_from_user with segment limit checking */
21983-ENTRY(copy_from_user)
21984- CFI_STARTPROC
21985- GET_THREAD_INFO(%rax)
21986- movq %rsi,%rcx
21987- addq %rdx,%rcx
21988- jc bad_from_user
21989- cmpq TI_addr_limit(%rax),%rcx
21990- ja bad_from_user
21991- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
21992- CFI_ENDPROC
21993-ENDPROC(copy_from_user)
21994-
21995 ENTRY(copy_user_generic)
21996 CFI_STARTPROC
21997 ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
21998 CFI_ENDPROC
21999 ENDPROC(copy_user_generic)
22000
22001-ENTRY(__copy_from_user_inatomic)
22002- CFI_STARTPROC
22003- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
22004- CFI_ENDPROC
22005-ENDPROC(__copy_from_user_inatomic)
22006-
22007 .section .fixup,"ax"
22008 /* must zero dest */
22009 ENTRY(bad_from_user)
22010 bad_from_user:
22011 CFI_STARTPROC
22012+ testl %edx,%edx
22013+ js bad_to_user
22014 movl %edx,%ecx
22015 xorl %eax,%eax
22016 rep
22017 stosb
22018 bad_to_user:
22019 movl %edx,%eax
22020+ pax_force_retaddr
22021 ret
22022 CFI_ENDPROC
22023 ENDPROC(bad_from_user)
22024@@ -142,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
22025 jz 17f
22026 1: movq (%rsi),%r8
22027 2: movq 1*8(%rsi),%r9
22028-3: movq 2*8(%rsi),%r10
22029+3: movq 2*8(%rsi),%rax
22030 4: movq 3*8(%rsi),%r11
22031 5: movq %r8,(%rdi)
22032 6: movq %r9,1*8(%rdi)
22033-7: movq %r10,2*8(%rdi)
22034+7: movq %rax,2*8(%rdi)
22035 8: movq %r11,3*8(%rdi)
22036 9: movq 4*8(%rsi),%r8
22037 10: movq 5*8(%rsi),%r9
22038-11: movq 6*8(%rsi),%r10
22039+11: movq 6*8(%rsi),%rax
22040 12: movq 7*8(%rsi),%r11
22041 13: movq %r8,4*8(%rdi)
22042 14: movq %r9,5*8(%rdi)
22043-15: movq %r10,6*8(%rdi)
22044+15: movq %rax,6*8(%rdi)
22045 16: movq %r11,7*8(%rdi)
22046 leaq 64(%rsi),%rsi
22047 leaq 64(%rdi),%rdi
22048@@ -180,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
22049 decl %ecx
22050 jnz 21b
22051 23: xor %eax,%eax
22052+ pax_force_retaddr
22053 ret
22054
22055 .section .fixup,"ax"
22056@@ -252,6 +226,7 @@ ENTRY(copy_user_generic_string)
22057 3: rep
22058 movsb
22059 4: xorl %eax,%eax
22060+ pax_force_retaddr
22061 ret
22062
22063 .section .fixup,"ax"
22064diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
22065index cb0c112..e3a6895 100644
22066--- a/arch/x86/lib/copy_user_nocache_64.S
22067+++ b/arch/x86/lib/copy_user_nocache_64.S
22068@@ -8,12 +8,14 @@
22069
22070 #include <linux/linkage.h>
22071 #include <asm/dwarf2.h>
22072+#include <asm/alternative-asm.h>
22073
22074 #define FIX_ALIGNMENT 1
22075
22076 #include <asm/current.h>
22077 #include <asm/asm-offsets.h>
22078 #include <asm/thread_info.h>
22079+#include <asm/pgtable.h>
22080
22081 .macro ALIGN_DESTINATION
22082 #ifdef FIX_ALIGNMENT
22083@@ -50,6 +52,15 @@
22084 */
22085 ENTRY(__copy_user_nocache)
22086 CFI_STARTPROC
22087+
22088+#ifdef CONFIG_PAX_MEMORY_UDEREF
22089+ mov $PAX_USER_SHADOW_BASE,%rcx
22090+ cmp %rcx,%rsi
22091+ jae 1f
22092+ add %rcx,%rsi
22093+1:
22094+#endif
22095+
22096 cmpl $8,%edx
22097 jb 20f /* less then 8 bytes, go to byte copy loop */
22098 ALIGN_DESTINATION
22099@@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
22100 jz 17f
22101 1: movq (%rsi),%r8
22102 2: movq 1*8(%rsi),%r9
22103-3: movq 2*8(%rsi),%r10
22104+3: movq 2*8(%rsi),%rax
22105 4: movq 3*8(%rsi),%r11
22106 5: movnti %r8,(%rdi)
22107 6: movnti %r9,1*8(%rdi)
22108-7: movnti %r10,2*8(%rdi)
22109+7: movnti %rax,2*8(%rdi)
22110 8: movnti %r11,3*8(%rdi)
22111 9: movq 4*8(%rsi),%r8
22112 10: movq 5*8(%rsi),%r9
22113-11: movq 6*8(%rsi),%r10
22114+11: movq 6*8(%rsi),%rax
22115 12: movq 7*8(%rsi),%r11
22116 13: movnti %r8,4*8(%rdi)
22117 14: movnti %r9,5*8(%rdi)
22118-15: movnti %r10,6*8(%rdi)
22119+15: movnti %rax,6*8(%rdi)
22120 16: movnti %r11,7*8(%rdi)
22121 leaq 64(%rsi),%rsi
22122 leaq 64(%rdi),%rdi
22123@@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
22124 jnz 21b
22125 23: xorl %eax,%eax
22126 sfence
22127+ pax_force_retaddr
22128 ret
22129
22130 .section .fixup,"ax"
22131diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
22132index f0dba36..48cb4d6 100644
22133--- a/arch/x86/lib/csum-copy_64.S
22134+++ b/arch/x86/lib/csum-copy_64.S
22135@@ -8,6 +8,7 @@
22136 #include <linux/linkage.h>
22137 #include <asm/dwarf2.h>
22138 #include <asm/errno.h>
22139+#include <asm/alternative-asm.h>
22140
22141 /*
22142 * Checksum copy with exception handling.
22143@@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
22144 CFI_RESTORE rbp
22145 addq $7*8,%rsp
22146 CFI_ADJUST_CFA_OFFSET -7*8
22147+ pax_force_retaddr 0, 1
22148 ret
22149 CFI_RESTORE_STATE
22150
22151diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
22152index 459b58a..9570bc7 100644
22153--- a/arch/x86/lib/csum-wrappers_64.c
22154+++ b/arch/x86/lib/csum-wrappers_64.c
22155@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
22156 len -= 2;
22157 }
22158 }
22159- isum = csum_partial_copy_generic((__force const void *)src,
22160+
22161+#ifdef CONFIG_PAX_MEMORY_UDEREF
22162+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
22163+ src += PAX_USER_SHADOW_BASE;
22164+#endif
22165+
22166+ isum = csum_partial_copy_generic((const void __force_kernel *)src,
22167 dst, len, isum, errp, NULL);
22168 if (unlikely(*errp))
22169 goto out_err;
22170@@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
22171 }
22172
22173 *errp = 0;
22174- return csum_partial_copy_generic(src, (void __force *)dst,
22175+
22176+#ifdef CONFIG_PAX_MEMORY_UDEREF
22177+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
22178+ dst += PAX_USER_SHADOW_BASE;
22179+#endif
22180+
22181+ return csum_partial_copy_generic(src, (void __force_kernel *)dst,
22182 len, isum, NULL, errp);
22183 }
22184 EXPORT_SYMBOL(csum_partial_copy_to_user);
22185diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
22186index 51f1504..ddac4c1 100644
22187--- a/arch/x86/lib/getuser.S
22188+++ b/arch/x86/lib/getuser.S
22189@@ -33,15 +33,38 @@
22190 #include <asm/asm-offsets.h>
22191 #include <asm/thread_info.h>
22192 #include <asm/asm.h>
22193+#include <asm/segment.h>
22194+#include <asm/pgtable.h>
22195+#include <asm/alternative-asm.h>
22196+
22197+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
22198+#define __copyuser_seg gs;
22199+#else
22200+#define __copyuser_seg
22201+#endif
22202
22203 .text
22204 ENTRY(__get_user_1)
22205 CFI_STARTPROC
22206+
22207+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22208 GET_THREAD_INFO(%_ASM_DX)
22209 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
22210 jae bad_get_user
22211-1: movzb (%_ASM_AX),%edx
22212+
22213+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22214+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
22215+ cmp %_ASM_DX,%_ASM_AX
22216+ jae 1234f
22217+ add %_ASM_DX,%_ASM_AX
22218+1234:
22219+#endif
22220+
22221+#endif
22222+
22223+1: __copyuser_seg movzb (%_ASM_AX),%edx
22224 xor %eax,%eax
22225+ pax_force_retaddr
22226 ret
22227 CFI_ENDPROC
22228 ENDPROC(__get_user_1)
22229@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
22230 ENTRY(__get_user_2)
22231 CFI_STARTPROC
22232 add $1,%_ASM_AX
22233+
22234+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22235 jc bad_get_user
22236 GET_THREAD_INFO(%_ASM_DX)
22237 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
22238 jae bad_get_user
22239-2: movzwl -1(%_ASM_AX),%edx
22240+
22241+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22242+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
22243+ cmp %_ASM_DX,%_ASM_AX
22244+ jae 1234f
22245+ add %_ASM_DX,%_ASM_AX
22246+1234:
22247+#endif
22248+
22249+#endif
22250+
22251+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
22252 xor %eax,%eax
22253+ pax_force_retaddr
22254 ret
22255 CFI_ENDPROC
22256 ENDPROC(__get_user_2)
22257@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
22258 ENTRY(__get_user_4)
22259 CFI_STARTPROC
22260 add $3,%_ASM_AX
22261+
22262+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22263 jc bad_get_user
22264 GET_THREAD_INFO(%_ASM_DX)
22265 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
22266 jae bad_get_user
22267-3: mov -3(%_ASM_AX),%edx
22268+
22269+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22270+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
22271+ cmp %_ASM_DX,%_ASM_AX
22272+ jae 1234f
22273+ add %_ASM_DX,%_ASM_AX
22274+1234:
22275+#endif
22276+
22277+#endif
22278+
22279+3: __copyuser_seg mov -3(%_ASM_AX),%edx
22280 xor %eax,%eax
22281+ pax_force_retaddr
22282 ret
22283 CFI_ENDPROC
22284 ENDPROC(__get_user_4)
22285@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
22286 GET_THREAD_INFO(%_ASM_DX)
22287 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
22288 jae bad_get_user
22289+
22290+#ifdef CONFIG_PAX_MEMORY_UDEREF
22291+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
22292+ cmp %_ASM_DX,%_ASM_AX
22293+ jae 1234f
22294+ add %_ASM_DX,%_ASM_AX
22295+1234:
22296+#endif
22297+
22298 4: movq -7(%_ASM_AX),%_ASM_DX
22299 xor %eax,%eax
22300+ pax_force_retaddr
22301 ret
22302 CFI_ENDPROC
22303 ENDPROC(__get_user_8)
22304@@ -91,6 +152,7 @@ bad_get_user:
22305 CFI_STARTPROC
22306 xor %edx,%edx
22307 mov $(-EFAULT),%_ASM_AX
22308+ pax_force_retaddr
22309 ret
22310 CFI_ENDPROC
22311 END(bad_get_user)
22312diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
22313index 05a95e7..326f2fa 100644
22314--- a/arch/x86/lib/iomap_copy_64.S
22315+++ b/arch/x86/lib/iomap_copy_64.S
22316@@ -17,6 +17,7 @@
22317
22318 #include <linux/linkage.h>
22319 #include <asm/dwarf2.h>
22320+#include <asm/alternative-asm.h>
22321
22322 /*
22323 * override generic version in lib/iomap_copy.c
22324@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
22325 CFI_STARTPROC
22326 movl %edx,%ecx
22327 rep movsd
22328+ pax_force_retaddr
22329 ret
22330 CFI_ENDPROC
22331 ENDPROC(__iowrite32_copy)
22332diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
22333index ad5441e..610e351 100644
22334--- a/arch/x86/lib/memcpy_64.S
22335+++ b/arch/x86/lib/memcpy_64.S
22336@@ -4,6 +4,7 @@
22337
22338 #include <asm/cpufeature.h>
22339 #include <asm/dwarf2.h>
22340+#include <asm/alternative-asm.h>
22341
22342 /*
22343 * memcpy - Copy a memory block.
22344@@ -34,6 +35,7 @@ memcpy_c:
22345 rep movsq
22346 movl %edx, %ecx
22347 rep movsb
22348+ pax_force_retaddr
22349 ret
22350 CFI_ENDPROC
22351 ENDPROC(memcpy_c)
22352@@ -118,6 +120,7 @@ ENTRY(memcpy)
22353 jnz .Lloop_1
22354
22355 .Lend:
22356+ pax_force_retaddr 0, 1
22357 ret
22358 CFI_ENDPROC
22359 ENDPROC(memcpy)
22360@@ -128,7 +131,7 @@ ENDPROC(__memcpy)
22361 * It is also a lot simpler. Use this when possible:
22362 */
22363
22364- .section .altinstr_replacement, "ax"
22365+ .section .altinstr_replacement, "a"
22366 1: .byte 0xeb /* jmp <disp8> */
22367 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
22368 2:
22369diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
22370index 2c59481..7e9ba4e 100644
22371--- a/arch/x86/lib/memset_64.S
22372+++ b/arch/x86/lib/memset_64.S
22373@@ -2,6 +2,7 @@
22374
22375 #include <linux/linkage.h>
22376 #include <asm/dwarf2.h>
22377+#include <asm/alternative-asm.h>
22378
22379 /*
22380 * ISO C memset - set a memory block to a byte value.
22381@@ -28,6 +29,7 @@ memset_c:
22382 movl %r8d,%ecx
22383 rep stosb
22384 movq %r9,%rax
22385+ pax_force_retaddr
22386 ret
22387 CFI_ENDPROC
22388 ENDPROC(memset_c)
22389@@ -35,13 +37,13 @@ ENDPROC(memset_c)
22390 ENTRY(memset)
22391 ENTRY(__memset)
22392 CFI_STARTPROC
22393- movq %rdi,%r10
22394 movq %rdx,%r11
22395
22396 /* expand byte value */
22397 movzbl %sil,%ecx
22398 movabs $0x0101010101010101,%rax
22399 mul %rcx /* with rax, clobbers rdx */
22400+ movq %rdi,%rdx
22401
22402 /* align dst */
22403 movl %edi,%r9d
22404@@ -95,7 +97,8 @@ ENTRY(__memset)
22405 jnz .Lloop_1
22406
22407 .Lende:
22408- movq %r10,%rax
22409+ movq %rdx,%rax
22410+ pax_force_retaddr
22411 ret
22412
22413 CFI_RESTORE_STATE
22414@@ -118,7 +121,7 @@ ENDPROC(__memset)
22415
22416 #include <asm/cpufeature.h>
22417
22418- .section .altinstr_replacement,"ax"
22419+ .section .altinstr_replacement,"a"
22420 1: .byte 0xeb /* jmp <disp8> */
22421 .byte (memset_c - memset) - (2f - 1b) /* offset */
22422 2:
22423diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
22424index c9f2d9b..e7fd2c0 100644
22425--- a/arch/x86/lib/mmx_32.c
22426+++ b/arch/x86/lib/mmx_32.c
22427@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22428 {
22429 void *p;
22430 int i;
22431+ unsigned long cr0;
22432
22433 if (unlikely(in_interrupt()))
22434 return __memcpy(to, from, len);
22435@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22436 kernel_fpu_begin();
22437
22438 __asm__ __volatile__ (
22439- "1: prefetch (%0)\n" /* This set is 28 bytes */
22440- " prefetch 64(%0)\n"
22441- " prefetch 128(%0)\n"
22442- " prefetch 192(%0)\n"
22443- " prefetch 256(%0)\n"
22444+ "1: prefetch (%1)\n" /* This set is 28 bytes */
22445+ " prefetch 64(%1)\n"
22446+ " prefetch 128(%1)\n"
22447+ " prefetch 192(%1)\n"
22448+ " prefetch 256(%1)\n"
22449 "2: \n"
22450 ".section .fixup, \"ax\"\n"
22451- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22452+ "3: \n"
22453+
22454+#ifdef CONFIG_PAX_KERNEXEC
22455+ " movl %%cr0, %0\n"
22456+ " movl %0, %%eax\n"
22457+ " andl $0xFFFEFFFF, %%eax\n"
22458+ " movl %%eax, %%cr0\n"
22459+#endif
22460+
22461+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22462+
22463+#ifdef CONFIG_PAX_KERNEXEC
22464+ " movl %0, %%cr0\n"
22465+#endif
22466+
22467 " jmp 2b\n"
22468 ".previous\n"
22469 _ASM_EXTABLE(1b, 3b)
22470- : : "r" (from));
22471+ : "=&r" (cr0) : "r" (from) : "ax");
22472
22473 for ( ; i > 5; i--) {
22474 __asm__ __volatile__ (
22475- "1: prefetch 320(%0)\n"
22476- "2: movq (%0), %%mm0\n"
22477- " movq 8(%0), %%mm1\n"
22478- " movq 16(%0), %%mm2\n"
22479- " movq 24(%0), %%mm3\n"
22480- " movq %%mm0, (%1)\n"
22481- " movq %%mm1, 8(%1)\n"
22482- " movq %%mm2, 16(%1)\n"
22483- " movq %%mm3, 24(%1)\n"
22484- " movq 32(%0), %%mm0\n"
22485- " movq 40(%0), %%mm1\n"
22486- " movq 48(%0), %%mm2\n"
22487- " movq 56(%0), %%mm3\n"
22488- " movq %%mm0, 32(%1)\n"
22489- " movq %%mm1, 40(%1)\n"
22490- " movq %%mm2, 48(%1)\n"
22491- " movq %%mm3, 56(%1)\n"
22492+ "1: prefetch 320(%1)\n"
22493+ "2: movq (%1), %%mm0\n"
22494+ " movq 8(%1), %%mm1\n"
22495+ " movq 16(%1), %%mm2\n"
22496+ " movq 24(%1), %%mm3\n"
22497+ " movq %%mm0, (%2)\n"
22498+ " movq %%mm1, 8(%2)\n"
22499+ " movq %%mm2, 16(%2)\n"
22500+ " movq %%mm3, 24(%2)\n"
22501+ " movq 32(%1), %%mm0\n"
22502+ " movq 40(%1), %%mm1\n"
22503+ " movq 48(%1), %%mm2\n"
22504+ " movq 56(%1), %%mm3\n"
22505+ " movq %%mm0, 32(%2)\n"
22506+ " movq %%mm1, 40(%2)\n"
22507+ " movq %%mm2, 48(%2)\n"
22508+ " movq %%mm3, 56(%2)\n"
22509 ".section .fixup, \"ax\"\n"
22510- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22511+ "3:\n"
22512+
22513+#ifdef CONFIG_PAX_KERNEXEC
22514+ " movl %%cr0, %0\n"
22515+ " movl %0, %%eax\n"
22516+ " andl $0xFFFEFFFF, %%eax\n"
22517+ " movl %%eax, %%cr0\n"
22518+#endif
22519+
22520+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22521+
22522+#ifdef CONFIG_PAX_KERNEXEC
22523+ " movl %0, %%cr0\n"
22524+#endif
22525+
22526 " jmp 2b\n"
22527 ".previous\n"
22528 _ASM_EXTABLE(1b, 3b)
22529- : : "r" (from), "r" (to) : "memory");
22530+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22531
22532 from += 64;
22533 to += 64;
22534@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
22535 static void fast_copy_page(void *to, void *from)
22536 {
22537 int i;
22538+ unsigned long cr0;
22539
22540 kernel_fpu_begin();
22541
22542@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
22543 * but that is for later. -AV
22544 */
22545 __asm__ __volatile__(
22546- "1: prefetch (%0)\n"
22547- " prefetch 64(%0)\n"
22548- " prefetch 128(%0)\n"
22549- " prefetch 192(%0)\n"
22550- " prefetch 256(%0)\n"
22551+ "1: prefetch (%1)\n"
22552+ " prefetch 64(%1)\n"
22553+ " prefetch 128(%1)\n"
22554+ " prefetch 192(%1)\n"
22555+ " prefetch 256(%1)\n"
22556 "2: \n"
22557 ".section .fixup, \"ax\"\n"
22558- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22559+ "3: \n"
22560+
22561+#ifdef CONFIG_PAX_KERNEXEC
22562+ " movl %%cr0, %0\n"
22563+ " movl %0, %%eax\n"
22564+ " andl $0xFFFEFFFF, %%eax\n"
22565+ " movl %%eax, %%cr0\n"
22566+#endif
22567+
22568+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22569+
22570+#ifdef CONFIG_PAX_KERNEXEC
22571+ " movl %0, %%cr0\n"
22572+#endif
22573+
22574 " jmp 2b\n"
22575 ".previous\n"
22576- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22577+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22578
22579 for (i = 0; i < (4096-320)/64; i++) {
22580 __asm__ __volatile__ (
22581- "1: prefetch 320(%0)\n"
22582- "2: movq (%0), %%mm0\n"
22583- " movntq %%mm0, (%1)\n"
22584- " movq 8(%0), %%mm1\n"
22585- " movntq %%mm1, 8(%1)\n"
22586- " movq 16(%0), %%mm2\n"
22587- " movntq %%mm2, 16(%1)\n"
22588- " movq 24(%0), %%mm3\n"
22589- " movntq %%mm3, 24(%1)\n"
22590- " movq 32(%0), %%mm4\n"
22591- " movntq %%mm4, 32(%1)\n"
22592- " movq 40(%0), %%mm5\n"
22593- " movntq %%mm5, 40(%1)\n"
22594- " movq 48(%0), %%mm6\n"
22595- " movntq %%mm6, 48(%1)\n"
22596- " movq 56(%0), %%mm7\n"
22597- " movntq %%mm7, 56(%1)\n"
22598+ "1: prefetch 320(%1)\n"
22599+ "2: movq (%1), %%mm0\n"
22600+ " movntq %%mm0, (%2)\n"
22601+ " movq 8(%1), %%mm1\n"
22602+ " movntq %%mm1, 8(%2)\n"
22603+ " movq 16(%1), %%mm2\n"
22604+ " movntq %%mm2, 16(%2)\n"
22605+ " movq 24(%1), %%mm3\n"
22606+ " movntq %%mm3, 24(%2)\n"
22607+ " movq 32(%1), %%mm4\n"
22608+ " movntq %%mm4, 32(%2)\n"
22609+ " movq 40(%1), %%mm5\n"
22610+ " movntq %%mm5, 40(%2)\n"
22611+ " movq 48(%1), %%mm6\n"
22612+ " movntq %%mm6, 48(%2)\n"
22613+ " movq 56(%1), %%mm7\n"
22614+ " movntq %%mm7, 56(%2)\n"
22615 ".section .fixup, \"ax\"\n"
22616- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22617+ "3:\n"
22618+
22619+#ifdef CONFIG_PAX_KERNEXEC
22620+ " movl %%cr0, %0\n"
22621+ " movl %0, %%eax\n"
22622+ " andl $0xFFFEFFFF, %%eax\n"
22623+ " movl %%eax, %%cr0\n"
22624+#endif
22625+
22626+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22627+
22628+#ifdef CONFIG_PAX_KERNEXEC
22629+ " movl %0, %%cr0\n"
22630+#endif
22631+
22632 " jmp 2b\n"
22633 ".previous\n"
22634- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
22635+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22636
22637 from += 64;
22638 to += 64;
22639@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
22640 static void fast_copy_page(void *to, void *from)
22641 {
22642 int i;
22643+ unsigned long cr0;
22644
22645 kernel_fpu_begin();
22646
22647 __asm__ __volatile__ (
22648- "1: prefetch (%0)\n"
22649- " prefetch 64(%0)\n"
22650- " prefetch 128(%0)\n"
22651- " prefetch 192(%0)\n"
22652- " prefetch 256(%0)\n"
22653+ "1: prefetch (%1)\n"
22654+ " prefetch 64(%1)\n"
22655+ " prefetch 128(%1)\n"
22656+ " prefetch 192(%1)\n"
22657+ " prefetch 256(%1)\n"
22658 "2: \n"
22659 ".section .fixup, \"ax\"\n"
22660- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22661+ "3: \n"
22662+
22663+#ifdef CONFIG_PAX_KERNEXEC
22664+ " movl %%cr0, %0\n"
22665+ " movl %0, %%eax\n"
22666+ " andl $0xFFFEFFFF, %%eax\n"
22667+ " movl %%eax, %%cr0\n"
22668+#endif
22669+
22670+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22671+
22672+#ifdef CONFIG_PAX_KERNEXEC
22673+ " movl %0, %%cr0\n"
22674+#endif
22675+
22676 " jmp 2b\n"
22677 ".previous\n"
22678- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22679+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22680
22681 for (i = 0; i < 4096/64; i++) {
22682 __asm__ __volatile__ (
22683- "1: prefetch 320(%0)\n"
22684- "2: movq (%0), %%mm0\n"
22685- " movq 8(%0), %%mm1\n"
22686- " movq 16(%0), %%mm2\n"
22687- " movq 24(%0), %%mm3\n"
22688- " movq %%mm0, (%1)\n"
22689- " movq %%mm1, 8(%1)\n"
22690- " movq %%mm2, 16(%1)\n"
22691- " movq %%mm3, 24(%1)\n"
22692- " movq 32(%0), %%mm0\n"
22693- " movq 40(%0), %%mm1\n"
22694- " movq 48(%0), %%mm2\n"
22695- " movq 56(%0), %%mm3\n"
22696- " movq %%mm0, 32(%1)\n"
22697- " movq %%mm1, 40(%1)\n"
22698- " movq %%mm2, 48(%1)\n"
22699- " movq %%mm3, 56(%1)\n"
22700+ "1: prefetch 320(%1)\n"
22701+ "2: movq (%1), %%mm0\n"
22702+ " movq 8(%1), %%mm1\n"
22703+ " movq 16(%1), %%mm2\n"
22704+ " movq 24(%1), %%mm3\n"
22705+ " movq %%mm0, (%2)\n"
22706+ " movq %%mm1, 8(%2)\n"
22707+ " movq %%mm2, 16(%2)\n"
22708+ " movq %%mm3, 24(%2)\n"
22709+ " movq 32(%1), %%mm0\n"
22710+ " movq 40(%1), %%mm1\n"
22711+ " movq 48(%1), %%mm2\n"
22712+ " movq 56(%1), %%mm3\n"
22713+ " movq %%mm0, 32(%2)\n"
22714+ " movq %%mm1, 40(%2)\n"
22715+ " movq %%mm2, 48(%2)\n"
22716+ " movq %%mm3, 56(%2)\n"
22717 ".section .fixup, \"ax\"\n"
22718- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22719+ "3:\n"
22720+
22721+#ifdef CONFIG_PAX_KERNEXEC
22722+ " movl %%cr0, %0\n"
22723+ " movl %0, %%eax\n"
22724+ " andl $0xFFFEFFFF, %%eax\n"
22725+ " movl %%eax, %%cr0\n"
22726+#endif
22727+
22728+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22729+
22730+#ifdef CONFIG_PAX_KERNEXEC
22731+ " movl %0, %%cr0\n"
22732+#endif
22733+
22734 " jmp 2b\n"
22735 ".previous\n"
22736 _ASM_EXTABLE(1b, 3b)
22737- : : "r" (from), "r" (to) : "memory");
22738+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22739
22740 from += 64;
22741 to += 64;
22742diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
22743index 69fa106..adda88b 100644
22744--- a/arch/x86/lib/msr-reg.S
22745+++ b/arch/x86/lib/msr-reg.S
22746@@ -3,6 +3,7 @@
22747 #include <asm/dwarf2.h>
22748 #include <asm/asm.h>
22749 #include <asm/msr.h>
22750+#include <asm/alternative-asm.h>
22751
22752 #ifdef CONFIG_X86_64
22753 /*
22754@@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
22755 CFI_STARTPROC
22756 pushq_cfi %rbx
22757 pushq_cfi %rbp
22758- movq %rdi, %r10 /* Save pointer */
22759+ movq %rdi, %r9 /* Save pointer */
22760 xorl %r11d, %r11d /* Return value */
22761 movl (%rdi), %eax
22762 movl 4(%rdi), %ecx
22763@@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
22764 movl 28(%rdi), %edi
22765 CFI_REMEMBER_STATE
22766 1: \op
22767-2: movl %eax, (%r10)
22768+2: movl %eax, (%r9)
22769 movl %r11d, %eax /* Return value */
22770- movl %ecx, 4(%r10)
22771- movl %edx, 8(%r10)
22772- movl %ebx, 12(%r10)
22773- movl %ebp, 20(%r10)
22774- movl %esi, 24(%r10)
22775- movl %edi, 28(%r10)
22776+ movl %ecx, 4(%r9)
22777+ movl %edx, 8(%r9)
22778+ movl %ebx, 12(%r9)
22779+ movl %ebp, 20(%r9)
22780+ movl %esi, 24(%r9)
22781+ movl %edi, 28(%r9)
22782 popq_cfi %rbp
22783 popq_cfi %rbx
22784+ pax_force_retaddr
22785 ret
22786 3:
22787 CFI_RESTORE_STATE
22788diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
22789index 36b0d15..d381858 100644
22790--- a/arch/x86/lib/putuser.S
22791+++ b/arch/x86/lib/putuser.S
22792@@ -15,7 +15,9 @@
22793 #include <asm/thread_info.h>
22794 #include <asm/errno.h>
22795 #include <asm/asm.h>
22796-
22797+#include <asm/segment.h>
22798+#include <asm/pgtable.h>
22799+#include <asm/alternative-asm.h>
22800
22801 /*
22802 * __put_user_X
22803@@ -29,52 +31,119 @@
22804 * as they get called from within inline assembly.
22805 */
22806
22807-#define ENTER CFI_STARTPROC ; \
22808- GET_THREAD_INFO(%_ASM_BX)
22809-#define EXIT ret ; \
22810+#define ENTER CFI_STARTPROC
22811+#define EXIT pax_force_retaddr; ret ; \
22812 CFI_ENDPROC
22813
22814+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22815+#define _DEST %_ASM_CX,%_ASM_BX
22816+#else
22817+#define _DEST %_ASM_CX
22818+#endif
22819+
22820+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
22821+#define __copyuser_seg gs;
22822+#else
22823+#define __copyuser_seg
22824+#endif
22825+
22826 .text
22827 ENTRY(__put_user_1)
22828 ENTER
22829+
22830+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22831+ GET_THREAD_INFO(%_ASM_BX)
22832 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
22833 jae bad_put_user
22834-1: movb %al,(%_ASM_CX)
22835+
22836+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22837+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22838+ cmp %_ASM_BX,%_ASM_CX
22839+ jb 1234f
22840+ xor %ebx,%ebx
22841+1234:
22842+#endif
22843+
22844+#endif
22845+
22846+1: __copyuser_seg movb %al,(_DEST)
22847 xor %eax,%eax
22848 EXIT
22849 ENDPROC(__put_user_1)
22850
22851 ENTRY(__put_user_2)
22852 ENTER
22853+
22854+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22855+ GET_THREAD_INFO(%_ASM_BX)
22856 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22857 sub $1,%_ASM_BX
22858 cmp %_ASM_BX,%_ASM_CX
22859 jae bad_put_user
22860-2: movw %ax,(%_ASM_CX)
22861+
22862+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22863+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22864+ cmp %_ASM_BX,%_ASM_CX
22865+ jb 1234f
22866+ xor %ebx,%ebx
22867+1234:
22868+#endif
22869+
22870+#endif
22871+
22872+2: __copyuser_seg movw %ax,(_DEST)
22873 xor %eax,%eax
22874 EXIT
22875 ENDPROC(__put_user_2)
22876
22877 ENTRY(__put_user_4)
22878 ENTER
22879+
22880+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22881+ GET_THREAD_INFO(%_ASM_BX)
22882 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22883 sub $3,%_ASM_BX
22884 cmp %_ASM_BX,%_ASM_CX
22885 jae bad_put_user
22886-3: movl %eax,(%_ASM_CX)
22887+
22888+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22889+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22890+ cmp %_ASM_BX,%_ASM_CX
22891+ jb 1234f
22892+ xor %ebx,%ebx
22893+1234:
22894+#endif
22895+
22896+#endif
22897+
22898+3: __copyuser_seg movl %eax,(_DEST)
22899 xor %eax,%eax
22900 EXIT
22901 ENDPROC(__put_user_4)
22902
22903 ENTRY(__put_user_8)
22904 ENTER
22905+
22906+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22907+ GET_THREAD_INFO(%_ASM_BX)
22908 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22909 sub $7,%_ASM_BX
22910 cmp %_ASM_BX,%_ASM_CX
22911 jae bad_put_user
22912-4: mov %_ASM_AX,(%_ASM_CX)
22913+
22914+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22915+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22916+ cmp %_ASM_BX,%_ASM_CX
22917+ jb 1234f
22918+ xor %ebx,%ebx
22919+1234:
22920+#endif
22921+
22922+#endif
22923+
22924+4: __copyuser_seg mov %_ASM_AX,(_DEST)
22925 #ifdef CONFIG_X86_32
22926-5: movl %edx,4(%_ASM_CX)
22927+5: __copyuser_seg movl %edx,4(_DEST)
22928 #endif
22929 xor %eax,%eax
22930 EXIT
22931diff --git a/arch/x86/lib/rwlock_64.S b/arch/x86/lib/rwlock_64.S
22932index 05ea55f..6345b9a 100644
22933--- a/arch/x86/lib/rwlock_64.S
22934+++ b/arch/x86/lib/rwlock_64.S
22935@@ -2,6 +2,7 @@
22936
22937 #include <linux/linkage.h>
22938 #include <asm/rwlock.h>
22939+#include <asm/asm.h>
22940 #include <asm/alternative-asm.h>
22941 #include <asm/dwarf2.h>
22942
22943@@ -10,13 +11,34 @@ ENTRY(__write_lock_failed)
22944 CFI_STARTPROC
22945 LOCK_PREFIX
22946 addl $RW_LOCK_BIAS,(%rdi)
22947+
22948+#ifdef CONFIG_PAX_REFCOUNT
22949+ jno 1234f
22950+ LOCK_PREFIX
22951+ subl $RW_LOCK_BIAS,(%rdi)
22952+ int $4
22953+1234:
22954+ _ASM_EXTABLE(1234b, 1234b)
22955+#endif
22956+
22957 1: rep
22958 nop
22959 cmpl $RW_LOCK_BIAS,(%rdi)
22960 jne 1b
22961 LOCK_PREFIX
22962 subl $RW_LOCK_BIAS,(%rdi)
22963+
22964+#ifdef CONFIG_PAX_REFCOUNT
22965+ jno 1234f
22966+ LOCK_PREFIX
22967+ addl $RW_LOCK_BIAS,(%rdi)
22968+ int $4
22969+1234:
22970+ _ASM_EXTABLE(1234b, 1234b)
22971+#endif
22972+
22973 jnz __write_lock_failed
22974+ pax_force_retaddr
22975 ret
22976 CFI_ENDPROC
22977 END(__write_lock_failed)
22978@@ -26,13 +48,34 @@ ENTRY(__read_lock_failed)
22979 CFI_STARTPROC
22980 LOCK_PREFIX
22981 incl (%rdi)
22982+
22983+#ifdef CONFIG_PAX_REFCOUNT
22984+ jno 1234f
22985+ LOCK_PREFIX
22986+ decl (%rdi)
22987+ int $4
22988+1234:
22989+ _ASM_EXTABLE(1234b, 1234b)
22990+#endif
22991+
22992 1: rep
22993 nop
22994 cmpl $1,(%rdi)
22995 js 1b
22996 LOCK_PREFIX
22997 decl (%rdi)
22998+
22999+#ifdef CONFIG_PAX_REFCOUNT
23000+ jno 1234f
23001+ LOCK_PREFIX
23002+ incl (%rdi)
23003+ int $4
23004+1234:
23005+ _ASM_EXTABLE(1234b, 1234b)
23006+#endif
23007+
23008 js __read_lock_failed
23009+ pax_force_retaddr
23010 ret
23011 CFI_ENDPROC
23012 END(__read_lock_failed)
23013diff --git a/arch/x86/lib/rwsem_64.S b/arch/x86/lib/rwsem_64.S
23014index 15acecf..f768b10 100644
23015--- a/arch/x86/lib/rwsem_64.S
23016+++ b/arch/x86/lib/rwsem_64.S
23017@@ -48,6 +48,7 @@ ENTRY(call_rwsem_down_read_failed)
23018 call rwsem_down_read_failed
23019 popq %rdx
23020 restore_common_regs
23021+ pax_force_retaddr
23022 ret
23023 ENDPROC(call_rwsem_down_read_failed)
23024
23025@@ -56,6 +57,7 @@ ENTRY(call_rwsem_down_write_failed)
23026 movq %rax,%rdi
23027 call rwsem_down_write_failed
23028 restore_common_regs
23029+ pax_force_retaddr
23030 ret
23031 ENDPROC(call_rwsem_down_write_failed)
23032
23033@@ -66,7 +68,8 @@ ENTRY(call_rwsem_wake)
23034 movq %rax,%rdi
23035 call rwsem_wake
23036 restore_common_regs
23037-1: ret
23038+1: pax_force_retaddr
23039+ ret
23040 ENDPROC(call_rwsem_wake)
23041
23042 /* Fix up special calling conventions */
23043@@ -77,5 +80,6 @@ ENTRY(call_rwsem_downgrade_wake)
23044 call rwsem_downgrade_wake
23045 popq %rdx
23046 restore_common_regs
23047+ pax_force_retaddr
23048 ret
23049 ENDPROC(call_rwsem_downgrade_wake)
23050diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
23051index bf9a7d5..fb06ab5 100644
23052--- a/arch/x86/lib/thunk_64.S
23053+++ b/arch/x86/lib/thunk_64.S
23054@@ -10,7 +10,8 @@
23055 #include <asm/dwarf2.h>
23056 #include <asm/calling.h>
23057 #include <asm/rwlock.h>
23058-
23059+ #include <asm/alternative-asm.h>
23060+
23061 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
23062 .macro thunk name,func
23063 .globl \name
23064@@ -70,6 +71,7 @@
23065 SAVE_ARGS
23066 restore:
23067 RESTORE_ARGS
23068+ pax_force_retaddr
23069 ret
23070 CFI_ENDPROC
23071
23072@@ -77,5 +79,6 @@ restore:
23073 SAVE_ARGS
23074 restore_norax:
23075 RESTORE_ARGS 1
23076+ pax_force_retaddr
23077 ret
23078 CFI_ENDPROC
23079diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
23080index 1f118d4..ec4a953 100644
23081--- a/arch/x86/lib/usercopy_32.c
23082+++ b/arch/x86/lib/usercopy_32.c
23083@@ -43,7 +43,7 @@ do { \
23084 __asm__ __volatile__( \
23085 " testl %1,%1\n" \
23086 " jz 2f\n" \
23087- "0: lodsb\n" \
23088+ "0: "__copyuser_seg"lodsb\n" \
23089 " stosb\n" \
23090 " testb %%al,%%al\n" \
23091 " jz 1f\n" \
23092@@ -128,10 +128,12 @@ do { \
23093 int __d0; \
23094 might_fault(); \
23095 __asm__ __volatile__( \
23096+ __COPYUSER_SET_ES \
23097 "0: rep; stosl\n" \
23098 " movl %2,%0\n" \
23099 "1: rep; stosb\n" \
23100 "2:\n" \
23101+ __COPYUSER_RESTORE_ES \
23102 ".section .fixup,\"ax\"\n" \
23103 "3: lea 0(%2,%0,4),%0\n" \
23104 " jmp 2b\n" \
23105@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, long n)
23106 might_fault();
23107
23108 __asm__ __volatile__(
23109+ __COPYUSER_SET_ES
23110 " testl %0, %0\n"
23111 " jz 3f\n"
23112 " andl %0,%%ecx\n"
23113@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n)
23114 " subl %%ecx,%0\n"
23115 " addl %0,%%eax\n"
23116 "1:\n"
23117+ __COPYUSER_RESTORE_ES
23118 ".section .fixup,\"ax\"\n"
23119 "2: xorl %%eax,%%eax\n"
23120 " jmp 1b\n"
23121@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
23122
23123 #ifdef CONFIG_X86_INTEL_USERCOPY
23124 static unsigned long
23125-__copy_user_intel(void __user *to, const void *from, unsigned long size)
23126+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
23127 {
23128 int d0, d1;
23129 __asm__ __volatile__(
23130@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
23131 " .align 2,0x90\n"
23132 "3: movl 0(%4), %%eax\n"
23133 "4: movl 4(%4), %%edx\n"
23134- "5: movl %%eax, 0(%3)\n"
23135- "6: movl %%edx, 4(%3)\n"
23136+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
23137+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
23138 "7: movl 8(%4), %%eax\n"
23139 "8: movl 12(%4),%%edx\n"
23140- "9: movl %%eax, 8(%3)\n"
23141- "10: movl %%edx, 12(%3)\n"
23142+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
23143+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
23144 "11: movl 16(%4), %%eax\n"
23145 "12: movl 20(%4), %%edx\n"
23146- "13: movl %%eax, 16(%3)\n"
23147- "14: movl %%edx, 20(%3)\n"
23148+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
23149+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
23150 "15: movl 24(%4), %%eax\n"
23151 "16: movl 28(%4), %%edx\n"
23152- "17: movl %%eax, 24(%3)\n"
23153- "18: movl %%edx, 28(%3)\n"
23154+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
23155+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
23156 "19: movl 32(%4), %%eax\n"
23157 "20: movl 36(%4), %%edx\n"
23158- "21: movl %%eax, 32(%3)\n"
23159- "22: movl %%edx, 36(%3)\n"
23160+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
23161+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
23162 "23: movl 40(%4), %%eax\n"
23163 "24: movl 44(%4), %%edx\n"
23164- "25: movl %%eax, 40(%3)\n"
23165- "26: movl %%edx, 44(%3)\n"
23166+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
23167+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
23168 "27: movl 48(%4), %%eax\n"
23169 "28: movl 52(%4), %%edx\n"
23170- "29: movl %%eax, 48(%3)\n"
23171- "30: movl %%edx, 52(%3)\n"
23172+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
23173+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
23174 "31: movl 56(%4), %%eax\n"
23175 "32: movl 60(%4), %%edx\n"
23176- "33: movl %%eax, 56(%3)\n"
23177- "34: movl %%edx, 60(%3)\n"
23178+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
23179+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
23180 " addl $-64, %0\n"
23181 " addl $64, %4\n"
23182 " addl $64, %3\n"
23183@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
23184 " shrl $2, %0\n"
23185 " andl $3, %%eax\n"
23186 " cld\n"
23187+ __COPYUSER_SET_ES
23188 "99: rep; movsl\n"
23189 "36: movl %%eax, %0\n"
23190 "37: rep; movsb\n"
23191 "100:\n"
23192+ __COPYUSER_RESTORE_ES
23193+ ".section .fixup,\"ax\"\n"
23194+ "101: lea 0(%%eax,%0,4),%0\n"
23195+ " jmp 100b\n"
23196+ ".previous\n"
23197+ ".section __ex_table,\"a\"\n"
23198+ " .align 4\n"
23199+ " .long 1b,100b\n"
23200+ " .long 2b,100b\n"
23201+ " .long 3b,100b\n"
23202+ " .long 4b,100b\n"
23203+ " .long 5b,100b\n"
23204+ " .long 6b,100b\n"
23205+ " .long 7b,100b\n"
23206+ " .long 8b,100b\n"
23207+ " .long 9b,100b\n"
23208+ " .long 10b,100b\n"
23209+ " .long 11b,100b\n"
23210+ " .long 12b,100b\n"
23211+ " .long 13b,100b\n"
23212+ " .long 14b,100b\n"
23213+ " .long 15b,100b\n"
23214+ " .long 16b,100b\n"
23215+ " .long 17b,100b\n"
23216+ " .long 18b,100b\n"
23217+ " .long 19b,100b\n"
23218+ " .long 20b,100b\n"
23219+ " .long 21b,100b\n"
23220+ " .long 22b,100b\n"
23221+ " .long 23b,100b\n"
23222+ " .long 24b,100b\n"
23223+ " .long 25b,100b\n"
23224+ " .long 26b,100b\n"
23225+ " .long 27b,100b\n"
23226+ " .long 28b,100b\n"
23227+ " .long 29b,100b\n"
23228+ " .long 30b,100b\n"
23229+ " .long 31b,100b\n"
23230+ " .long 32b,100b\n"
23231+ " .long 33b,100b\n"
23232+ " .long 34b,100b\n"
23233+ " .long 35b,100b\n"
23234+ " .long 36b,100b\n"
23235+ " .long 37b,100b\n"
23236+ " .long 99b,101b\n"
23237+ ".previous"
23238+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
23239+ : "1"(to), "2"(from), "0"(size)
23240+ : "eax", "edx", "memory");
23241+ return size;
23242+}
23243+
23244+static unsigned long
23245+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
23246+{
23247+ int d0, d1;
23248+ __asm__ __volatile__(
23249+ " .align 2,0x90\n"
23250+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
23251+ " cmpl $67, %0\n"
23252+ " jbe 3f\n"
23253+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
23254+ " .align 2,0x90\n"
23255+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
23256+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
23257+ "5: movl %%eax, 0(%3)\n"
23258+ "6: movl %%edx, 4(%3)\n"
23259+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
23260+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
23261+ "9: movl %%eax, 8(%3)\n"
23262+ "10: movl %%edx, 12(%3)\n"
23263+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
23264+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
23265+ "13: movl %%eax, 16(%3)\n"
23266+ "14: movl %%edx, 20(%3)\n"
23267+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
23268+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
23269+ "17: movl %%eax, 24(%3)\n"
23270+ "18: movl %%edx, 28(%3)\n"
23271+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
23272+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
23273+ "21: movl %%eax, 32(%3)\n"
23274+ "22: movl %%edx, 36(%3)\n"
23275+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
23276+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
23277+ "25: movl %%eax, 40(%3)\n"
23278+ "26: movl %%edx, 44(%3)\n"
23279+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
23280+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
23281+ "29: movl %%eax, 48(%3)\n"
23282+ "30: movl %%edx, 52(%3)\n"
23283+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
23284+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
23285+ "33: movl %%eax, 56(%3)\n"
23286+ "34: movl %%edx, 60(%3)\n"
23287+ " addl $-64, %0\n"
23288+ " addl $64, %4\n"
23289+ " addl $64, %3\n"
23290+ " cmpl $63, %0\n"
23291+ " ja 1b\n"
23292+ "35: movl %0, %%eax\n"
23293+ " shrl $2, %0\n"
23294+ " andl $3, %%eax\n"
23295+ " cld\n"
23296+ "99: rep; "__copyuser_seg" movsl\n"
23297+ "36: movl %%eax, %0\n"
23298+ "37: rep; "__copyuser_seg" movsb\n"
23299+ "100:\n"
23300 ".section .fixup,\"ax\"\n"
23301 "101: lea 0(%%eax,%0,4),%0\n"
23302 " jmp 100b\n"
23303@@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
23304 int d0, d1;
23305 __asm__ __volatile__(
23306 " .align 2,0x90\n"
23307- "0: movl 32(%4), %%eax\n"
23308+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23309 " cmpl $67, %0\n"
23310 " jbe 2f\n"
23311- "1: movl 64(%4), %%eax\n"
23312+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23313 " .align 2,0x90\n"
23314- "2: movl 0(%4), %%eax\n"
23315- "21: movl 4(%4), %%edx\n"
23316+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23317+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23318 " movl %%eax, 0(%3)\n"
23319 " movl %%edx, 4(%3)\n"
23320- "3: movl 8(%4), %%eax\n"
23321- "31: movl 12(%4),%%edx\n"
23322+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23323+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23324 " movl %%eax, 8(%3)\n"
23325 " movl %%edx, 12(%3)\n"
23326- "4: movl 16(%4), %%eax\n"
23327- "41: movl 20(%4), %%edx\n"
23328+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23329+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23330 " movl %%eax, 16(%3)\n"
23331 " movl %%edx, 20(%3)\n"
23332- "10: movl 24(%4), %%eax\n"
23333- "51: movl 28(%4), %%edx\n"
23334+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23335+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23336 " movl %%eax, 24(%3)\n"
23337 " movl %%edx, 28(%3)\n"
23338- "11: movl 32(%4), %%eax\n"
23339- "61: movl 36(%4), %%edx\n"
23340+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23341+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23342 " movl %%eax, 32(%3)\n"
23343 " movl %%edx, 36(%3)\n"
23344- "12: movl 40(%4), %%eax\n"
23345- "71: movl 44(%4), %%edx\n"
23346+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23347+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23348 " movl %%eax, 40(%3)\n"
23349 " movl %%edx, 44(%3)\n"
23350- "13: movl 48(%4), %%eax\n"
23351- "81: movl 52(%4), %%edx\n"
23352+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23353+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23354 " movl %%eax, 48(%3)\n"
23355 " movl %%edx, 52(%3)\n"
23356- "14: movl 56(%4), %%eax\n"
23357- "91: movl 60(%4), %%edx\n"
23358+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23359+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23360 " movl %%eax, 56(%3)\n"
23361 " movl %%edx, 60(%3)\n"
23362 " addl $-64, %0\n"
23363@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
23364 " shrl $2, %0\n"
23365 " andl $3, %%eax\n"
23366 " cld\n"
23367- "6: rep; movsl\n"
23368+ "6: rep; "__copyuser_seg" movsl\n"
23369 " movl %%eax,%0\n"
23370- "7: rep; movsb\n"
23371+ "7: rep; "__copyuser_seg" movsb\n"
23372 "8:\n"
23373 ".section .fixup,\"ax\"\n"
23374 "9: lea 0(%%eax,%0,4),%0\n"
23375@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23376
23377 __asm__ __volatile__(
23378 " .align 2,0x90\n"
23379- "0: movl 32(%4), %%eax\n"
23380+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23381 " cmpl $67, %0\n"
23382 " jbe 2f\n"
23383- "1: movl 64(%4), %%eax\n"
23384+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23385 " .align 2,0x90\n"
23386- "2: movl 0(%4), %%eax\n"
23387- "21: movl 4(%4), %%edx\n"
23388+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23389+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23390 " movnti %%eax, 0(%3)\n"
23391 " movnti %%edx, 4(%3)\n"
23392- "3: movl 8(%4), %%eax\n"
23393- "31: movl 12(%4),%%edx\n"
23394+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23395+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23396 " movnti %%eax, 8(%3)\n"
23397 " movnti %%edx, 12(%3)\n"
23398- "4: movl 16(%4), %%eax\n"
23399- "41: movl 20(%4), %%edx\n"
23400+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23401+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23402 " movnti %%eax, 16(%3)\n"
23403 " movnti %%edx, 20(%3)\n"
23404- "10: movl 24(%4), %%eax\n"
23405- "51: movl 28(%4), %%edx\n"
23406+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23407+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23408 " movnti %%eax, 24(%3)\n"
23409 " movnti %%edx, 28(%3)\n"
23410- "11: movl 32(%4), %%eax\n"
23411- "61: movl 36(%4), %%edx\n"
23412+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23413+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23414 " movnti %%eax, 32(%3)\n"
23415 " movnti %%edx, 36(%3)\n"
23416- "12: movl 40(%4), %%eax\n"
23417- "71: movl 44(%4), %%edx\n"
23418+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23419+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23420 " movnti %%eax, 40(%3)\n"
23421 " movnti %%edx, 44(%3)\n"
23422- "13: movl 48(%4), %%eax\n"
23423- "81: movl 52(%4), %%edx\n"
23424+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23425+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23426 " movnti %%eax, 48(%3)\n"
23427 " movnti %%edx, 52(%3)\n"
23428- "14: movl 56(%4), %%eax\n"
23429- "91: movl 60(%4), %%edx\n"
23430+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23431+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23432 " movnti %%eax, 56(%3)\n"
23433 " movnti %%edx, 60(%3)\n"
23434 " addl $-64, %0\n"
23435@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23436 " shrl $2, %0\n"
23437 " andl $3, %%eax\n"
23438 " cld\n"
23439- "6: rep; movsl\n"
23440+ "6: rep; "__copyuser_seg" movsl\n"
23441 " movl %%eax,%0\n"
23442- "7: rep; movsb\n"
23443+ "7: rep; "__copyuser_seg" movsb\n"
23444 "8:\n"
23445 ".section .fixup,\"ax\"\n"
23446 "9: lea 0(%%eax,%0,4),%0\n"
23447@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
23448
23449 __asm__ __volatile__(
23450 " .align 2,0x90\n"
23451- "0: movl 32(%4), %%eax\n"
23452+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23453 " cmpl $67, %0\n"
23454 " jbe 2f\n"
23455- "1: movl 64(%4), %%eax\n"
23456+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23457 " .align 2,0x90\n"
23458- "2: movl 0(%4), %%eax\n"
23459- "21: movl 4(%4), %%edx\n"
23460+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23461+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23462 " movnti %%eax, 0(%3)\n"
23463 " movnti %%edx, 4(%3)\n"
23464- "3: movl 8(%4), %%eax\n"
23465- "31: movl 12(%4),%%edx\n"
23466+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23467+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23468 " movnti %%eax, 8(%3)\n"
23469 " movnti %%edx, 12(%3)\n"
23470- "4: movl 16(%4), %%eax\n"
23471- "41: movl 20(%4), %%edx\n"
23472+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23473+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23474 " movnti %%eax, 16(%3)\n"
23475 " movnti %%edx, 20(%3)\n"
23476- "10: movl 24(%4), %%eax\n"
23477- "51: movl 28(%4), %%edx\n"
23478+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23479+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23480 " movnti %%eax, 24(%3)\n"
23481 " movnti %%edx, 28(%3)\n"
23482- "11: movl 32(%4), %%eax\n"
23483- "61: movl 36(%4), %%edx\n"
23484+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23485+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23486 " movnti %%eax, 32(%3)\n"
23487 " movnti %%edx, 36(%3)\n"
23488- "12: movl 40(%4), %%eax\n"
23489- "71: movl 44(%4), %%edx\n"
23490+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23491+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23492 " movnti %%eax, 40(%3)\n"
23493 " movnti %%edx, 44(%3)\n"
23494- "13: movl 48(%4), %%eax\n"
23495- "81: movl 52(%4), %%edx\n"
23496+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23497+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23498 " movnti %%eax, 48(%3)\n"
23499 " movnti %%edx, 52(%3)\n"
23500- "14: movl 56(%4), %%eax\n"
23501- "91: movl 60(%4), %%edx\n"
23502+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23503+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23504 " movnti %%eax, 56(%3)\n"
23505 " movnti %%edx, 60(%3)\n"
23506 " addl $-64, %0\n"
23507@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
23508 " shrl $2, %0\n"
23509 " andl $3, %%eax\n"
23510 " cld\n"
23511- "6: rep; movsl\n"
23512+ "6: rep; "__copyuser_seg" movsl\n"
23513 " movl %%eax,%0\n"
23514- "7: rep; movsb\n"
23515+ "7: rep; "__copyuser_seg" movsb\n"
23516 "8:\n"
23517 ".section .fixup,\"ax\"\n"
23518 "9: lea 0(%%eax,%0,4),%0\n"
23519@@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
23520 */
23521 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
23522 unsigned long size);
23523-unsigned long __copy_user_intel(void __user *to, const void *from,
23524+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
23525+ unsigned long size);
23526+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
23527 unsigned long size);
23528 unsigned long __copy_user_zeroing_intel_nocache(void *to,
23529 const void __user *from, unsigned long size);
23530 #endif /* CONFIG_X86_INTEL_USERCOPY */
23531
23532 /* Generic arbitrary sized copy. */
23533-#define __copy_user(to, from, size) \
23534+#define __copy_user(to, from, size, prefix, set, restore) \
23535 do { \
23536 int __d0, __d1, __d2; \
23537 __asm__ __volatile__( \
23538+ set \
23539 " cmp $7,%0\n" \
23540 " jbe 1f\n" \
23541 " movl %1,%0\n" \
23542 " negl %0\n" \
23543 " andl $7,%0\n" \
23544 " subl %0,%3\n" \
23545- "4: rep; movsb\n" \
23546+ "4: rep; "prefix"movsb\n" \
23547 " movl %3,%0\n" \
23548 " shrl $2,%0\n" \
23549 " andl $3,%3\n" \
23550 " .align 2,0x90\n" \
23551- "0: rep; movsl\n" \
23552+ "0: rep; "prefix"movsl\n" \
23553 " movl %3,%0\n" \
23554- "1: rep; movsb\n" \
23555+ "1: rep; "prefix"movsb\n" \
23556 "2:\n" \
23557+ restore \
23558 ".section .fixup,\"ax\"\n" \
23559 "5: addl %3,%0\n" \
23560 " jmp 2b\n" \
23561@@ -682,14 +799,14 @@ do { \
23562 " negl %0\n" \
23563 " andl $7,%0\n" \
23564 " subl %0,%3\n" \
23565- "4: rep; movsb\n" \
23566+ "4: rep; "__copyuser_seg"movsb\n" \
23567 " movl %3,%0\n" \
23568 " shrl $2,%0\n" \
23569 " andl $3,%3\n" \
23570 " .align 2,0x90\n" \
23571- "0: rep; movsl\n" \
23572+ "0: rep; "__copyuser_seg"movsl\n" \
23573 " movl %3,%0\n" \
23574- "1: rep; movsb\n" \
23575+ "1: rep; "__copyuser_seg"movsb\n" \
23576 "2:\n" \
23577 ".section .fixup,\"ax\"\n" \
23578 "5: addl %3,%0\n" \
23579@@ -775,9 +892,9 @@ survive:
23580 }
23581 #endif
23582 if (movsl_is_ok(to, from, n))
23583- __copy_user(to, from, n);
23584+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
23585 else
23586- n = __copy_user_intel(to, from, n);
23587+ n = __generic_copy_to_user_intel(to, from, n);
23588 return n;
23589 }
23590 EXPORT_SYMBOL(__copy_to_user_ll);
23591@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
23592 unsigned long n)
23593 {
23594 if (movsl_is_ok(to, from, n))
23595- __copy_user(to, from, n);
23596+ __copy_user(to, from, n, __copyuser_seg, "", "");
23597 else
23598- n = __copy_user_intel((void __user *)to,
23599- (const void *)from, n);
23600+ n = __generic_copy_from_user_intel(to, from, n);
23601 return n;
23602 }
23603 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
23604@@ -827,59 +943,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
23605 if (n > 64 && cpu_has_xmm2)
23606 n = __copy_user_intel_nocache(to, from, n);
23607 else
23608- __copy_user(to, from, n);
23609+ __copy_user(to, from, n, __copyuser_seg, "", "");
23610 #else
23611- __copy_user(to, from, n);
23612+ __copy_user(to, from, n, __copyuser_seg, "", "");
23613 #endif
23614 return n;
23615 }
23616 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
23617
23618-/**
23619- * copy_to_user: - Copy a block of data into user space.
23620- * @to: Destination address, in user space.
23621- * @from: Source address, in kernel space.
23622- * @n: Number of bytes to copy.
23623- *
23624- * Context: User context only. This function may sleep.
23625- *
23626- * Copy data from kernel space to user space.
23627- *
23628- * Returns number of bytes that could not be copied.
23629- * On success, this will be zero.
23630- */
23631-unsigned long
23632-copy_to_user(void __user *to, const void *from, unsigned long n)
23633+#ifdef CONFIG_PAX_MEMORY_UDEREF
23634+void __set_fs(mm_segment_t x)
23635 {
23636- if (access_ok(VERIFY_WRITE, to, n))
23637- n = __copy_to_user(to, from, n);
23638- return n;
23639+ switch (x.seg) {
23640+ case 0:
23641+ loadsegment(gs, 0);
23642+ break;
23643+ case TASK_SIZE_MAX:
23644+ loadsegment(gs, __USER_DS);
23645+ break;
23646+ case -1UL:
23647+ loadsegment(gs, __KERNEL_DS);
23648+ break;
23649+ default:
23650+ BUG();
23651+ }
23652+ return;
23653 }
23654-EXPORT_SYMBOL(copy_to_user);
23655+EXPORT_SYMBOL(__set_fs);
23656
23657-/**
23658- * copy_from_user: - Copy a block of data from user space.
23659- * @to: Destination address, in kernel space.
23660- * @from: Source address, in user space.
23661- * @n: Number of bytes to copy.
23662- *
23663- * Context: User context only. This function may sleep.
23664- *
23665- * Copy data from user space to kernel space.
23666- *
23667- * Returns number of bytes that could not be copied.
23668- * On success, this will be zero.
23669- *
23670- * If some data could not be copied, this function will pad the copied
23671- * data to the requested size using zero bytes.
23672- */
23673-unsigned long
23674-copy_from_user(void *to, const void __user *from, unsigned long n)
23675+void set_fs(mm_segment_t x)
23676 {
23677- if (access_ok(VERIFY_READ, from, n))
23678- n = __copy_from_user(to, from, n);
23679- else
23680- memset(to, 0, n);
23681- return n;
23682+ current_thread_info()->addr_limit = x;
23683+ __set_fs(x);
23684 }
23685-EXPORT_SYMBOL(copy_from_user);
23686+EXPORT_SYMBOL(set_fs);
23687+#endif
23688diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
23689index b7c2849..8633ad8 100644
23690--- a/arch/x86/lib/usercopy_64.c
23691+++ b/arch/x86/lib/usercopy_64.c
23692@@ -42,6 +42,12 @@ long
23693 __strncpy_from_user(char *dst, const char __user *src, long count)
23694 {
23695 long res;
23696+
23697+#ifdef CONFIG_PAX_MEMORY_UDEREF
23698+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
23699+ src += PAX_USER_SHADOW_BASE;
23700+#endif
23701+
23702 __do_strncpy_from_user(dst, src, count, res);
23703 return res;
23704 }
23705@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
23706 {
23707 long __d0;
23708 might_fault();
23709+
23710+#ifdef CONFIG_PAX_MEMORY_UDEREF
23711+ if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
23712+ addr += PAX_USER_SHADOW_BASE;
23713+#endif
23714+
23715 /* no memory constraint because it doesn't change any memory gcc knows
23716 about */
23717 asm volatile(
23718@@ -149,12 +161,20 @@ long strlen_user(const char __user *s)
23719 }
23720 EXPORT_SYMBOL(strlen_user);
23721
23722-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
23723+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
23724 {
23725- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23726- return copy_user_generic((__force void *)to, (__force void *)from, len);
23727- }
23728- return len;
23729+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23730+
23731+#ifdef CONFIG_PAX_MEMORY_UDEREF
23732+ if ((unsigned long)to < PAX_USER_SHADOW_BASE)
23733+ to += PAX_USER_SHADOW_BASE;
23734+ if ((unsigned long)from < PAX_USER_SHADOW_BASE)
23735+ from += PAX_USER_SHADOW_BASE;
23736+#endif
23737+
23738+ return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
23739+ }
23740+ return len;
23741 }
23742 EXPORT_SYMBOL(copy_in_user);
23743
23744@@ -164,7 +184,7 @@ EXPORT_SYMBOL(copy_in_user);
23745 * it is not necessary to optimize tail handling.
23746 */
23747 unsigned long
23748-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
23749+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
23750 {
23751 char c;
23752 unsigned zero_len;
23753diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
23754index 61b41ca..5fef66a 100644
23755--- a/arch/x86/mm/extable.c
23756+++ b/arch/x86/mm/extable.c
23757@@ -1,14 +1,71 @@
23758 #include <linux/module.h>
23759 #include <linux/spinlock.h>
23760+#include <linux/sort.h>
23761 #include <asm/uaccess.h>
23762+#include <asm/pgtable.h>
23763
23764+/*
23765+ * The exception table needs to be sorted so that the binary
23766+ * search that we use to find entries in it works properly.
23767+ * This is used both for the kernel exception table and for
23768+ * the exception tables of modules that get loaded.
23769+ */
23770+static int cmp_ex(const void *a, const void *b)
23771+{
23772+ const struct exception_table_entry *x = a, *y = b;
23773+
23774+ /* avoid overflow */
23775+ if (x->insn > y->insn)
23776+ return 1;
23777+ if (x->insn < y->insn)
23778+ return -1;
23779+ return 0;
23780+}
23781+
23782+static void swap_ex(void *a, void *b, int size)
23783+{
23784+ struct exception_table_entry t, *x = a, *y = b;
23785+
23786+ t = *x;
23787+
23788+ pax_open_kernel();
23789+ *x = *y;
23790+ *y = t;
23791+ pax_close_kernel();
23792+}
23793+
23794+void sort_extable(struct exception_table_entry *start,
23795+ struct exception_table_entry *finish)
23796+{
23797+ sort(start, finish - start, sizeof(struct exception_table_entry),
23798+ cmp_ex, swap_ex);
23799+}
23800+
23801+#ifdef CONFIG_MODULES
23802+/*
23803+ * If the exception table is sorted, any referring to the module init
23804+ * will be at the beginning or the end.
23805+ */
23806+void trim_init_extable(struct module *m)
23807+{
23808+ /*trim the beginning*/
23809+ while (m->num_exentries && within_module_init(m->extable[0].insn, m)) {
23810+ m->extable++;
23811+ m->num_exentries--;
23812+ }
23813+ /*trim the end*/
23814+ while (m->num_exentries &&
23815+ within_module_init(m->extable[m->num_exentries-1].insn, m))
23816+ m->num_exentries--;
23817+}
23818+#endif /* CONFIG_MODULES */
23819
23820 int fixup_exception(struct pt_regs *regs)
23821 {
23822 const struct exception_table_entry *fixup;
23823
23824 #ifdef CONFIG_PNPBIOS
23825- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
23826+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
23827 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
23828 extern u32 pnp_bios_is_utter_crap;
23829 pnp_bios_is_utter_crap = 1;
23830diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
23831index 8ac0d76..ca501e2 100644
23832--- a/arch/x86/mm/fault.c
23833+++ b/arch/x86/mm/fault.c
23834@@ -11,10 +11,19 @@
23835 #include <linux/kprobes.h> /* __kprobes, ... */
23836 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
23837 #include <linux/perf_event.h> /* perf_sw_event */
23838+#include <linux/unistd.h>
23839+#include <linux/compiler.h>
23840
23841 #include <asm/traps.h> /* dotraplinkage, ... */
23842 #include <asm/pgalloc.h> /* pgd_*(), ... */
23843 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
23844+#include <asm/vsyscall.h>
23845+#include <asm/tlbflush.h>
23846+
23847+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23848+#include <asm/stacktrace.h>
23849+#include "../kernel/dumpstack.h"
23850+#endif
23851
23852 /*
23853 * Page fault error code bits:
23854@@ -51,7 +60,7 @@ static inline int notify_page_fault(struct pt_regs *regs)
23855 int ret = 0;
23856
23857 /* kprobe_running() needs smp_processor_id() */
23858- if (kprobes_built_in() && !user_mode_vm(regs)) {
23859+ if (kprobes_built_in() && !user_mode(regs)) {
23860 preempt_disable();
23861 if (kprobe_running() && kprobe_fault_handler(regs, 14))
23862 ret = 1;
23863@@ -112,7 +121,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
23864 return !instr_lo || (instr_lo>>1) == 1;
23865 case 0x00:
23866 /* Prefetch instruction is 0x0F0D or 0x0F18 */
23867- if (probe_kernel_address(instr, opcode))
23868+ if (user_mode(regs)) {
23869+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23870+ return 0;
23871+ } else if (probe_kernel_address(instr, opcode))
23872 return 0;
23873
23874 *prefetch = (instr_lo == 0xF) &&
23875@@ -146,7 +158,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
23876 while (instr < max_instr) {
23877 unsigned char opcode;
23878
23879- if (probe_kernel_address(instr, opcode))
23880+ if (user_mode(regs)) {
23881+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23882+ break;
23883+ } else if (probe_kernel_address(instr, opcode))
23884 break;
23885
23886 instr++;
23887@@ -172,6 +187,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
23888 force_sig_info(si_signo, &info, tsk);
23889 }
23890
23891+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23892+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
23893+#endif
23894+
23895+#ifdef CONFIG_PAX_EMUTRAMP
23896+static int pax_handle_fetch_fault(struct pt_regs *regs);
23897+#endif
23898+
23899+#ifdef CONFIG_PAX_PAGEEXEC
23900+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
23901+{
23902+ pgd_t *pgd;
23903+ pud_t *pud;
23904+ pmd_t *pmd;
23905+
23906+ pgd = pgd_offset(mm, address);
23907+ if (!pgd_present(*pgd))
23908+ return NULL;
23909+ pud = pud_offset(pgd, address);
23910+ if (!pud_present(*pud))
23911+ return NULL;
23912+ pmd = pmd_offset(pud, address);
23913+ if (!pmd_present(*pmd))
23914+ return NULL;
23915+ return pmd;
23916+}
23917+#endif
23918+
23919 DEFINE_SPINLOCK(pgd_lock);
23920 LIST_HEAD(pgd_list);
23921
23922@@ -224,11 +267,24 @@ void vmalloc_sync_all(void)
23923 address += PMD_SIZE) {
23924
23925 unsigned long flags;
23926+
23927+#ifdef CONFIG_PAX_PER_CPU_PGD
23928+ unsigned long cpu;
23929+#else
23930 struct page *page;
23931+#endif
23932
23933 spin_lock_irqsave(&pgd_lock, flags);
23934+
23935+#ifdef CONFIG_PAX_PER_CPU_PGD
23936+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
23937+ pgd_t *pgd = get_cpu_pgd(cpu);
23938+#else
23939 list_for_each_entry(page, &pgd_list, lru) {
23940- if (!vmalloc_sync_one(page_address(page), address))
23941+ pgd_t *pgd = page_address(page);
23942+#endif
23943+
23944+ if (!vmalloc_sync_one(pgd, address))
23945 break;
23946 }
23947 spin_unlock_irqrestore(&pgd_lock, flags);
23948@@ -258,6 +314,11 @@ static noinline int vmalloc_fault(unsigned long address)
23949 * an interrupt in the middle of a task switch..
23950 */
23951 pgd_paddr = read_cr3();
23952+
23953+#ifdef CONFIG_PAX_PER_CPU_PGD
23954+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
23955+#endif
23956+
23957 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
23958 if (!pmd_k)
23959 return -1;
23960@@ -332,15 +393,27 @@ void vmalloc_sync_all(void)
23961
23962 const pgd_t *pgd_ref = pgd_offset_k(address);
23963 unsigned long flags;
23964+
23965+#ifdef CONFIG_PAX_PER_CPU_PGD
23966+ unsigned long cpu;
23967+#else
23968 struct page *page;
23969+#endif
23970
23971 if (pgd_none(*pgd_ref))
23972 continue;
23973
23974 spin_lock_irqsave(&pgd_lock, flags);
23975+
23976+#ifdef CONFIG_PAX_PER_CPU_PGD
23977+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
23978+ pgd_t *pgd = pgd_offset_cpu(cpu, address);
23979+#else
23980 list_for_each_entry(page, &pgd_list, lru) {
23981 pgd_t *pgd;
23982 pgd = (pgd_t *)page_address(page) + pgd_index(address);
23983+#endif
23984+
23985 if (pgd_none(*pgd))
23986 set_pgd(pgd, *pgd_ref);
23987 else
23988@@ -373,7 +446,14 @@ static noinline int vmalloc_fault(unsigned long address)
23989 * happen within a race in page table update. In the later
23990 * case just flush:
23991 */
23992+
23993+#ifdef CONFIG_PAX_PER_CPU_PGD
23994+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
23995+ pgd = pgd_offset_cpu(smp_processor_id(), address);
23996+#else
23997 pgd = pgd_offset(current->active_mm, address);
23998+#endif
23999+
24000 pgd_ref = pgd_offset_k(address);
24001 if (pgd_none(*pgd_ref))
24002 return -1;
24003@@ -535,7 +615,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
24004 static int is_errata100(struct pt_regs *regs, unsigned long address)
24005 {
24006 #ifdef CONFIG_X86_64
24007- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
24008+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
24009 return 1;
24010 #endif
24011 return 0;
24012@@ -562,7 +642,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
24013 }
24014
24015 static const char nx_warning[] = KERN_CRIT
24016-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
24017+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
24018
24019 static void
24020 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
24021@@ -571,15 +651,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
24022 if (!oops_may_print())
24023 return;
24024
24025- if (error_code & PF_INSTR) {
24026+ if (nx_enabled && (error_code & PF_INSTR)) {
24027 unsigned int level;
24028
24029 pte_t *pte = lookup_address(address, &level);
24030
24031 if (pte && pte_present(*pte) && !pte_exec(*pte))
24032- printk(nx_warning, current_uid());
24033+ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current));
24034 }
24035
24036+#ifdef CONFIG_PAX_KERNEXEC
24037+ if (init_mm.start_code <= address && address < init_mm.end_code) {
24038+ if (current->signal->curr_ip)
24039+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
24040+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
24041+ else
24042+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
24043+ current->comm, task_pid_nr(current), current_uid(), current_euid());
24044+ }
24045+#endif
24046+
24047 printk(KERN_ALERT "BUG: unable to handle kernel ");
24048 if (address < PAGE_SIZE)
24049 printk(KERN_CONT "NULL pointer dereference");
24050@@ -705,6 +796,23 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
24051 {
24052 struct task_struct *tsk = current;
24053
24054+#ifdef CONFIG_X86_64
24055+ struct mm_struct *mm = tsk->mm;
24056+
24057+ if (mm && (error_code & PF_INSTR) && mm->context.vdso) {
24058+ if (regs->ip == (unsigned long)vgettimeofday) {
24059+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_gettimeofday);
24060+ return;
24061+ } else if (regs->ip == (unsigned long)vtime) {
24062+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_time);
24063+ return;
24064+ } else if (regs->ip == (unsigned long)vgetcpu) {
24065+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, getcpu);
24066+ return;
24067+ }
24068+ }
24069+#endif
24070+
24071 /* User mode accesses just cause a SIGSEGV */
24072 if (error_code & PF_USER) {
24073 /*
24074@@ -722,6 +830,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
24075 if (is_errata100(regs, address))
24076 return;
24077
24078+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24079+ if (pax_is_fetch_fault(regs, error_code, address)) {
24080+
24081+#ifdef CONFIG_PAX_EMUTRAMP
24082+ switch (pax_handle_fetch_fault(regs)) {
24083+ case 2:
24084+ return;
24085+ }
24086+#endif
24087+
24088+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
24089+ do_group_exit(SIGKILL);
24090+ }
24091+#endif
24092+
24093 if (unlikely(show_unhandled_signals))
24094 show_signal_msg(regs, error_code, address, tsk);
24095
24096@@ -818,7 +941,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
24097 if (fault & VM_FAULT_HWPOISON) {
24098 printk(KERN_ERR
24099 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
24100- tsk->comm, tsk->pid, address);
24101+ tsk->comm, task_pid_nr(tsk), address);
24102 code = BUS_MCEERR_AR;
24103 }
24104 #endif
24105@@ -857,6 +980,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
24106 return 1;
24107 }
24108
24109+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
24110+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
24111+{
24112+ pte_t *pte;
24113+ pmd_t *pmd;
24114+ spinlock_t *ptl;
24115+ unsigned char pte_mask;
24116+
24117+ if (nx_enabled || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
24118+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
24119+ return 0;
24120+
24121+ /* PaX: it's our fault, let's handle it if we can */
24122+
24123+ /* PaX: take a look at read faults before acquiring any locks */
24124+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
24125+ /* instruction fetch attempt from a protected page in user mode */
24126+ up_read(&mm->mmap_sem);
24127+
24128+#ifdef CONFIG_PAX_EMUTRAMP
24129+ switch (pax_handle_fetch_fault(regs)) {
24130+ case 2:
24131+ return 1;
24132+ }
24133+#endif
24134+
24135+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
24136+ do_group_exit(SIGKILL);
24137+ }
24138+
24139+ pmd = pax_get_pmd(mm, address);
24140+ if (unlikely(!pmd))
24141+ return 0;
24142+
24143+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
24144+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
24145+ pte_unmap_unlock(pte, ptl);
24146+ return 0;
24147+ }
24148+
24149+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
24150+ /* write attempt to a protected page in user mode */
24151+ pte_unmap_unlock(pte, ptl);
24152+ return 0;
24153+ }
24154+
24155+#ifdef CONFIG_SMP
24156+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
24157+#else
24158+ if (likely(address > get_limit(regs->cs)))
24159+#endif
24160+ {
24161+ set_pte(pte, pte_mkread(*pte));
24162+ __flush_tlb_one(address);
24163+ pte_unmap_unlock(pte, ptl);
24164+ up_read(&mm->mmap_sem);
24165+ return 1;
24166+ }
24167+
24168+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
24169+
24170+ /*
24171+ * PaX: fill DTLB with user rights and retry
24172+ */
24173+ __asm__ __volatile__ (
24174+ "orb %2,(%1)\n"
24175+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
24176+/*
24177+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
24178+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
24179+ * page fault when examined during a TLB load attempt. this is true not only
24180+ * for PTEs holding a non-present entry but also present entries that will
24181+ * raise a page fault (such as those set up by PaX, or the copy-on-write
24182+ * mechanism). in effect it means that we do *not* need to flush the TLBs
24183+ * for our target pages since their PTEs are simply not in the TLBs at all.
24184+
24185+ * the best thing in omitting it is that we gain around 15-20% speed in the
24186+ * fast path of the page fault handler and can get rid of tracing since we
24187+ * can no longer flush unintended entries.
24188+ */
24189+ "invlpg (%0)\n"
24190+#endif
24191+ __copyuser_seg"testb $0,(%0)\n"
24192+ "xorb %3,(%1)\n"
24193+ :
24194+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
24195+ : "memory", "cc");
24196+ pte_unmap_unlock(pte, ptl);
24197+ up_read(&mm->mmap_sem);
24198+ return 1;
24199+}
24200+#endif
24201+
24202 /*
24203 * Handle a spurious fault caused by a stale TLB entry.
24204 *
24205@@ -923,6 +1139,9 @@ int show_unhandled_signals = 1;
24206 static inline int
24207 access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
24208 {
24209+ if (nx_enabled && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
24210+ return 1;
24211+
24212 if (write) {
24213 /* write, present and write, not present: */
24214 if (unlikely(!(vma->vm_flags & VM_WRITE)))
24215@@ -956,16 +1175,30 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
24216 {
24217 struct vm_area_struct *vma;
24218 struct task_struct *tsk;
24219- unsigned long address;
24220 struct mm_struct *mm;
24221 int write;
24222 int fault;
24223
24224- tsk = current;
24225- mm = tsk->mm;
24226-
24227 /* Get the faulting address: */
24228- address = read_cr2();
24229+ unsigned long address = read_cr2();
24230+
24231+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
24232+ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
24233+ if (!search_exception_tables(regs->ip)) {
24234+ bad_area_nosemaphore(regs, error_code, address);
24235+ return;
24236+ }
24237+ if (address < PAX_USER_SHADOW_BASE) {
24238+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
24239+ printk(KERN_ERR "PAX: faulting IP: %pA\n", (void *)regs->ip);
24240+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
24241+ } else
24242+ address -= PAX_USER_SHADOW_BASE;
24243+ }
24244+#endif
24245+
24246+ tsk = current;
24247+ mm = tsk->mm;
24248
24249 /*
24250 * Detect and handle instructions that would cause a page fault for
24251@@ -1026,7 +1259,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
24252 * User-mode registers count as a user access even for any
24253 * potential system fault or CPU buglet:
24254 */
24255- if (user_mode_vm(regs)) {
24256+ if (user_mode(regs)) {
24257 local_irq_enable();
24258 error_code |= PF_USER;
24259 } else {
24260@@ -1080,6 +1313,11 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
24261 might_sleep();
24262 }
24263
24264+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
24265+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
24266+ return;
24267+#endif
24268+
24269 vma = find_vma(mm, address);
24270 if (unlikely(!vma)) {
24271 bad_area(regs, error_code, address);
24272@@ -1091,18 +1329,24 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
24273 bad_area(regs, error_code, address);
24274 return;
24275 }
24276- if (error_code & PF_USER) {
24277- /*
24278- * Accessing the stack below %sp is always a bug.
24279- * The large cushion allows instructions like enter
24280- * and pusha to work. ("enter $65535, $31" pushes
24281- * 32 pointers and then decrements %sp by 65535.)
24282- */
24283- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
24284- bad_area(regs, error_code, address);
24285- return;
24286- }
24287+ /*
24288+ * Accessing the stack below %sp is always a bug.
24289+ * The large cushion allows instructions like enter
24290+ * and pusha to work. ("enter $65535, $31" pushes
24291+ * 32 pointers and then decrements %sp by 65535.)
24292+ */
24293+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
24294+ bad_area(regs, error_code, address);
24295+ return;
24296 }
24297+
24298+#ifdef CONFIG_PAX_SEGMEXEC
24299+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
24300+ bad_area(regs, error_code, address);
24301+ return;
24302+ }
24303+#endif
24304+
24305 if (unlikely(expand_stack(vma, address))) {
24306 bad_area(regs, error_code, address);
24307 return;
24308@@ -1146,3 +1390,292 @@ good_area:
24309
24310 up_read(&mm->mmap_sem);
24311 }
24312+
24313+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24314+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
24315+{
24316+ struct mm_struct *mm = current->mm;
24317+ unsigned long ip = regs->ip;
24318+
24319+ if (v8086_mode(regs))
24320+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
24321+
24322+#ifdef CONFIG_PAX_PAGEEXEC
24323+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
24324+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
24325+ return true;
24326+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
24327+ return true;
24328+ return false;
24329+ }
24330+#endif
24331+
24332+#ifdef CONFIG_PAX_SEGMEXEC
24333+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
24334+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
24335+ return true;
24336+ return false;
24337+ }
24338+#endif
24339+
24340+ return false;
24341+}
24342+#endif
24343+
24344+#ifdef CONFIG_PAX_EMUTRAMP
24345+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
24346+{
24347+ int err;
24348+
24349+ do { /* PaX: libffi trampoline emulation */
24350+ unsigned char mov, jmp;
24351+ unsigned int addr1, addr2;
24352+
24353+#ifdef CONFIG_X86_64
24354+ if ((regs->ip + 9) >> 32)
24355+ break;
24356+#endif
24357+
24358+ err = get_user(mov, (unsigned char __user *)regs->ip);
24359+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24360+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
24361+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24362+
24363+ if (err)
24364+ break;
24365+
24366+ if (mov == 0xB8 && jmp == 0xE9) {
24367+ regs->ax = addr1;
24368+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
24369+ return 2;
24370+ }
24371+ } while (0);
24372+
24373+ do { /* PaX: gcc trampoline emulation #1 */
24374+ unsigned char mov1, mov2;
24375+ unsigned short jmp;
24376+ unsigned int addr1, addr2;
24377+
24378+#ifdef CONFIG_X86_64
24379+ if ((regs->ip + 11) >> 32)
24380+ break;
24381+#endif
24382+
24383+ err = get_user(mov1, (unsigned char __user *)regs->ip);
24384+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24385+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
24386+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24387+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
24388+
24389+ if (err)
24390+ break;
24391+
24392+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
24393+ regs->cx = addr1;
24394+ regs->ax = addr2;
24395+ regs->ip = addr2;
24396+ return 2;
24397+ }
24398+ } while (0);
24399+
24400+ do { /* PaX: gcc trampoline emulation #2 */
24401+ unsigned char mov, jmp;
24402+ unsigned int addr1, addr2;
24403+
24404+#ifdef CONFIG_X86_64
24405+ if ((regs->ip + 9) >> 32)
24406+ break;
24407+#endif
24408+
24409+ err = get_user(mov, (unsigned char __user *)regs->ip);
24410+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24411+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
24412+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24413+
24414+ if (err)
24415+ break;
24416+
24417+ if (mov == 0xB9 && jmp == 0xE9) {
24418+ regs->cx = addr1;
24419+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
24420+ return 2;
24421+ }
24422+ } while (0);
24423+
24424+ return 1; /* PaX in action */
24425+}
24426+
24427+#ifdef CONFIG_X86_64
24428+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
24429+{
24430+ int err;
24431+
24432+ do { /* PaX: libffi trampoline emulation */
24433+ unsigned short mov1, mov2, jmp1;
24434+ unsigned char stcclc, jmp2;
24435+ unsigned long addr1, addr2;
24436+
24437+ err = get_user(mov1, (unsigned short __user *)regs->ip);
24438+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24439+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24440+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24441+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
24442+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
24443+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
24444+
24445+ if (err)
24446+ break;
24447+
24448+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24449+ regs->r11 = addr1;
24450+ regs->r10 = addr2;
24451+ if (stcclc == 0xF8)
24452+ regs->flags &= ~X86_EFLAGS_CF;
24453+ else
24454+ regs->flags |= X86_EFLAGS_CF;
24455+ regs->ip = addr1;
24456+ return 2;
24457+ }
24458+ } while (0);
24459+
24460+ do { /* PaX: gcc trampoline emulation #1 */
24461+ unsigned short mov1, mov2, jmp1;
24462+ unsigned char jmp2;
24463+ unsigned int addr1;
24464+ unsigned long addr2;
24465+
24466+ err = get_user(mov1, (unsigned short __user *)regs->ip);
24467+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
24468+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
24469+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
24470+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
24471+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
24472+
24473+ if (err)
24474+ break;
24475+
24476+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24477+ regs->r11 = addr1;
24478+ regs->r10 = addr2;
24479+ regs->ip = addr1;
24480+ return 2;
24481+ }
24482+ } while (0);
24483+
24484+ do { /* PaX: gcc trampoline emulation #2 */
24485+ unsigned short mov1, mov2, jmp1;
24486+ unsigned char jmp2;
24487+ unsigned long addr1, addr2;
24488+
24489+ err = get_user(mov1, (unsigned short __user *)regs->ip);
24490+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24491+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24492+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24493+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
24494+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
24495+
24496+ if (err)
24497+ break;
24498+
24499+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24500+ regs->r11 = addr1;
24501+ regs->r10 = addr2;
24502+ regs->ip = addr1;
24503+ return 2;
24504+ }
24505+ } while (0);
24506+
24507+ return 1; /* PaX in action */
24508+}
24509+#endif
24510+
24511+/*
24512+ * PaX: decide what to do with offenders (regs->ip = fault address)
24513+ *
24514+ * returns 1 when task should be killed
24515+ * 2 when gcc trampoline was detected
24516+ */
24517+static int pax_handle_fetch_fault(struct pt_regs *regs)
24518+{
24519+ if (v8086_mode(regs))
24520+ return 1;
24521+
24522+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
24523+ return 1;
24524+
24525+#ifdef CONFIG_X86_32
24526+ return pax_handle_fetch_fault_32(regs);
24527+#else
24528+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
24529+ return pax_handle_fetch_fault_32(regs);
24530+ else
24531+ return pax_handle_fetch_fault_64(regs);
24532+#endif
24533+}
24534+#endif
24535+
24536+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24537+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
24538+{
24539+ long i;
24540+
24541+ printk(KERN_ERR "PAX: bytes at PC: ");
24542+ for (i = 0; i < 20; i++) {
24543+ unsigned char c;
24544+ if (get_user(c, (unsigned char __force_user *)pc+i))
24545+ printk(KERN_CONT "?? ");
24546+ else
24547+ printk(KERN_CONT "%02x ", c);
24548+ }
24549+ printk("\n");
24550+
24551+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
24552+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
24553+ unsigned long c;
24554+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
24555+#ifdef CONFIG_X86_32
24556+ printk(KERN_CONT "???????? ");
24557+#else
24558+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
24559+ printk(KERN_CONT "???????? ???????? ");
24560+ else
24561+ printk(KERN_CONT "???????????????? ");
24562+#endif
24563+ } else {
24564+#ifdef CONFIG_X86_64
24565+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
24566+ printk(KERN_CONT "%08x ", (unsigned int)c);
24567+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
24568+ } else
24569+#endif
24570+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
24571+ }
24572+ }
24573+ printk("\n");
24574+}
24575+#endif
24576+
24577+/**
24578+ * probe_kernel_write(): safely attempt to write to a location
24579+ * @dst: address to write to
24580+ * @src: pointer to the data that shall be written
24581+ * @size: size of the data chunk
24582+ *
24583+ * Safely write to address @dst from the buffer at @src. If a kernel fault
24584+ * happens, handle that and return -EFAULT.
24585+ */
24586+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
24587+{
24588+ long ret;
24589+ mm_segment_t old_fs = get_fs();
24590+
24591+ set_fs(KERNEL_DS);
24592+ pagefault_disable();
24593+ pax_open_kernel();
24594+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
24595+ pax_close_kernel();
24596+ pagefault_enable();
24597+ set_fs(old_fs);
24598+
24599+ return ret ? -EFAULT : 0;
24600+}
24601diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
24602index 71da1bc..7a16bf4 100644
24603--- a/arch/x86/mm/gup.c
24604+++ b/arch/x86/mm/gup.c
24605@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
24606 addr = start;
24607 len = (unsigned long) nr_pages << PAGE_SHIFT;
24608 end = start + len;
24609- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24610+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24611 (void __user *)start, len)))
24612 return 0;
24613
24614diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
24615index 63a6ba6..79abd7a 100644
24616--- a/arch/x86/mm/highmem_32.c
24617+++ b/arch/x86/mm/highmem_32.c
24618@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot)
24619 idx = type + KM_TYPE_NR*smp_processor_id();
24620 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24621 BUG_ON(!pte_none(*(kmap_pte-idx)));
24622+
24623+ pax_open_kernel();
24624 set_pte(kmap_pte-idx, mk_pte(page, prot));
24625+ pax_close_kernel();
24626
24627 return (void *)vaddr;
24628 }
24629diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
24630index f46c340..6ff9a26 100644
24631--- a/arch/x86/mm/hugetlbpage.c
24632+++ b/arch/x86/mm/hugetlbpage.c
24633@@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
24634 struct hstate *h = hstate_file(file);
24635 struct mm_struct *mm = current->mm;
24636 struct vm_area_struct *vma;
24637- unsigned long start_addr;
24638+ unsigned long start_addr, pax_task_size = TASK_SIZE;
24639+
24640+#ifdef CONFIG_PAX_SEGMEXEC
24641+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24642+ pax_task_size = SEGMEXEC_TASK_SIZE;
24643+#endif
24644+
24645+ pax_task_size -= PAGE_SIZE;
24646
24647 if (len > mm->cached_hole_size) {
24648- start_addr = mm->free_area_cache;
24649+ start_addr = mm->free_area_cache;
24650 } else {
24651- start_addr = TASK_UNMAPPED_BASE;
24652- mm->cached_hole_size = 0;
24653+ start_addr = mm->mmap_base;
24654+ mm->cached_hole_size = 0;
24655 }
24656
24657 full_search:
24658@@ -281,26 +288,27 @@ full_search:
24659
24660 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
24661 /* At this point: (!vma || addr < vma->vm_end). */
24662- if (TASK_SIZE - len < addr) {
24663+ if (pax_task_size - len < addr) {
24664 /*
24665 * Start a new search - just in case we missed
24666 * some holes.
24667 */
24668- if (start_addr != TASK_UNMAPPED_BASE) {
24669- start_addr = TASK_UNMAPPED_BASE;
24670+ if (start_addr != mm->mmap_base) {
24671+ start_addr = mm->mmap_base;
24672 mm->cached_hole_size = 0;
24673 goto full_search;
24674 }
24675 return -ENOMEM;
24676 }
24677- if (!vma || addr + len <= vma->vm_start) {
24678- mm->free_area_cache = addr + len;
24679- return addr;
24680- }
24681+ if (check_heap_stack_gap(vma, addr, len))
24682+ break;
24683 if (addr + mm->cached_hole_size < vma->vm_start)
24684 mm->cached_hole_size = vma->vm_start - addr;
24685 addr = ALIGN(vma->vm_end, huge_page_size(h));
24686 }
24687+
24688+ mm->free_area_cache = addr + len;
24689+ return addr;
24690 }
24691
24692 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24693@@ -309,10 +317,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24694 {
24695 struct hstate *h = hstate_file(file);
24696 struct mm_struct *mm = current->mm;
24697- struct vm_area_struct *vma, *prev_vma;
24698- unsigned long base = mm->mmap_base, addr = addr0;
24699+ struct vm_area_struct *vma;
24700+ unsigned long base = mm->mmap_base, addr;
24701 unsigned long largest_hole = mm->cached_hole_size;
24702- int first_time = 1;
24703
24704 /* don't allow allocations above current base */
24705 if (mm->free_area_cache > base)
24706@@ -322,64 +329,63 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24707 largest_hole = 0;
24708 mm->free_area_cache = base;
24709 }
24710-try_again:
24711+
24712 /* make sure it can fit in the remaining address space */
24713 if (mm->free_area_cache < len)
24714 goto fail;
24715
24716 /* either no address requested or cant fit in requested address hole */
24717- addr = (mm->free_area_cache - len) & huge_page_mask(h);
24718+ addr = (mm->free_area_cache - len);
24719 do {
24720+ addr &= huge_page_mask(h);
24721+ vma = find_vma(mm, addr);
24722 /*
24723 * Lookup failure means no vma is above this address,
24724 * i.e. return with success:
24725- */
24726- if (!(vma = find_vma_prev(mm, addr, &prev_vma)))
24727- return addr;
24728-
24729- /*
24730 * new region fits between prev_vma->vm_end and
24731 * vma->vm_start, use it:
24732 */
24733- if (addr + len <= vma->vm_start &&
24734- (!prev_vma || (addr >= prev_vma->vm_end))) {
24735+ if (check_heap_stack_gap(vma, addr, len)) {
24736 /* remember the address as a hint for next time */
24737- mm->cached_hole_size = largest_hole;
24738- return (mm->free_area_cache = addr);
24739- } else {
24740- /* pull free_area_cache down to the first hole */
24741- if (mm->free_area_cache == vma->vm_end) {
24742- mm->free_area_cache = vma->vm_start;
24743- mm->cached_hole_size = largest_hole;
24744- }
24745+ mm->cached_hole_size = largest_hole;
24746+ return (mm->free_area_cache = addr);
24747+ }
24748+ /* pull free_area_cache down to the first hole */
24749+ if (mm->free_area_cache == vma->vm_end) {
24750+ mm->free_area_cache = vma->vm_start;
24751+ mm->cached_hole_size = largest_hole;
24752 }
24753
24754 /* remember the largest hole we saw so far */
24755 if (addr + largest_hole < vma->vm_start)
24756- largest_hole = vma->vm_start - addr;
24757+ largest_hole = vma->vm_start - addr;
24758
24759 /* try just below the current vma->vm_start */
24760- addr = (vma->vm_start - len) & huge_page_mask(h);
24761- } while (len <= vma->vm_start);
24762+ addr = skip_heap_stack_gap(vma, len);
24763+ } while (!IS_ERR_VALUE(addr));
24764
24765 fail:
24766 /*
24767- * if hint left us with no space for the requested
24768- * mapping then try again:
24769- */
24770- if (first_time) {
24771- mm->free_area_cache = base;
24772- largest_hole = 0;
24773- first_time = 0;
24774- goto try_again;
24775- }
24776- /*
24777 * A failed mmap() very likely causes application failure,
24778 * so fall back to the bottom-up function here. This scenario
24779 * can happen with large stack limits and large mmap()
24780 * allocations.
24781 */
24782- mm->free_area_cache = TASK_UNMAPPED_BASE;
24783+
24784+#ifdef CONFIG_PAX_SEGMEXEC
24785+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24786+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
24787+ else
24788+#endif
24789+
24790+ mm->mmap_base = TASK_UNMAPPED_BASE;
24791+
24792+#ifdef CONFIG_PAX_RANDMMAP
24793+ if (mm->pax_flags & MF_PAX_RANDMMAP)
24794+ mm->mmap_base += mm->delta_mmap;
24795+#endif
24796+
24797+ mm->free_area_cache = mm->mmap_base;
24798 mm->cached_hole_size = ~0UL;
24799 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
24800 len, pgoff, flags);
24801@@ -387,6 +393,7 @@ fail:
24802 /*
24803 * Restore the topdown base:
24804 */
24805+ mm->mmap_base = base;
24806 mm->free_area_cache = base;
24807 mm->cached_hole_size = ~0UL;
24808
24809@@ -400,10 +407,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24810 struct hstate *h = hstate_file(file);
24811 struct mm_struct *mm = current->mm;
24812 struct vm_area_struct *vma;
24813+ unsigned long pax_task_size = TASK_SIZE;
24814
24815 if (len & ~huge_page_mask(h))
24816 return -EINVAL;
24817- if (len > TASK_SIZE)
24818+
24819+#ifdef CONFIG_PAX_SEGMEXEC
24820+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24821+ pax_task_size = SEGMEXEC_TASK_SIZE;
24822+#endif
24823+
24824+ pax_task_size -= PAGE_SIZE;
24825+
24826+ if (len > pax_task_size)
24827 return -ENOMEM;
24828
24829 if (flags & MAP_FIXED) {
24830@@ -415,8 +431,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24831 if (addr) {
24832 addr = ALIGN(addr, huge_page_size(h));
24833 vma = find_vma(mm, addr);
24834- if (TASK_SIZE - len >= addr &&
24835- (!vma || addr + len <= vma->vm_start))
24836+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
24837 return addr;
24838 }
24839 if (mm->get_unmapped_area == arch_get_unmapped_area)
24840diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
24841index 73ffd55..f61c2a7 100644
24842--- a/arch/x86/mm/init.c
24843+++ b/arch/x86/mm/init.c
24844@@ -69,11 +69,7 @@ static void __init find_early_table_space(unsigned long end, int use_pse,
24845 * cause a hotspot and fill up ZONE_DMA. The page tables
24846 * need roughly 0.5KB per GB.
24847 */
24848-#ifdef CONFIG_X86_32
24849- start = 0x7000;
24850-#else
24851- start = 0x8000;
24852-#endif
24853+ start = 0x100000;
24854 e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
24855 tables, PAGE_SIZE);
24856 if (e820_table_start == -1UL)
24857@@ -147,7 +143,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
24858 #endif
24859
24860 set_nx();
24861- if (nx_enabled)
24862+ if (nx_enabled && cpu_has_nx)
24863 printk(KERN_INFO "NX (Execute Disable) protection: active\n");
24864
24865 /* Enable PSE if available */
24866@@ -329,10 +325,27 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
24867 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
24868 * mmio resources as well as potential bios/acpi data regions.
24869 */
24870+
24871 int devmem_is_allowed(unsigned long pagenr)
24872 {
24873+#ifdef CONFIG_GRKERNSEC_KMEM
24874+ /* allow BDA */
24875+ if (!pagenr)
24876+ return 1;
24877+ /* allow EBDA */
24878+ if ((0x9f000 >> PAGE_SHIFT) == pagenr)
24879+ return 1;
24880+ /* allow ISA/video mem */
24881+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
24882+ return 1;
24883+ /* throw out everything else below 1MB */
24884+ if (pagenr <= 256)
24885+ return 0;
24886+#else
24887 if (pagenr <= 256)
24888 return 1;
24889+#endif
24890+
24891 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
24892 return 0;
24893 if (!page_is_ram(pagenr))
24894@@ -379,6 +392,86 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
24895
24896 void free_initmem(void)
24897 {
24898+
24899+#ifdef CONFIG_PAX_KERNEXEC
24900+#ifdef CONFIG_X86_32
24901+ /* PaX: limit KERNEL_CS to actual size */
24902+ unsigned long addr, limit;
24903+ struct desc_struct d;
24904+ int cpu;
24905+
24906+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
24907+ limit = (limit - 1UL) >> PAGE_SHIFT;
24908+
24909+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
24910+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
24911+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
24912+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
24913+ }
24914+
24915+ /* PaX: make KERNEL_CS read-only */
24916+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
24917+ if (!paravirt_enabled())
24918+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
24919+/*
24920+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
24921+ pgd = pgd_offset_k(addr);
24922+ pud = pud_offset(pgd, addr);
24923+ pmd = pmd_offset(pud, addr);
24924+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24925+ }
24926+*/
24927+#ifdef CONFIG_X86_PAE
24928+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
24929+/*
24930+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
24931+ pgd = pgd_offset_k(addr);
24932+ pud = pud_offset(pgd, addr);
24933+ pmd = pmd_offset(pud, addr);
24934+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24935+ }
24936+*/
24937+#endif
24938+
24939+#ifdef CONFIG_MODULES
24940+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
24941+#endif
24942+
24943+#else
24944+ pgd_t *pgd;
24945+ pud_t *pud;
24946+ pmd_t *pmd;
24947+ unsigned long addr, end;
24948+
24949+ /* PaX: make kernel code/rodata read-only, rest non-executable */
24950+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
24951+ pgd = pgd_offset_k(addr);
24952+ pud = pud_offset(pgd, addr);
24953+ pmd = pmd_offset(pud, addr);
24954+ if (!pmd_present(*pmd))
24955+ continue;
24956+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
24957+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24958+ else
24959+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24960+ }
24961+
24962+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
24963+ end = addr + KERNEL_IMAGE_SIZE;
24964+ for (; addr < end; addr += PMD_SIZE) {
24965+ pgd = pgd_offset_k(addr);
24966+ pud = pud_offset(pgd, addr);
24967+ pmd = pmd_offset(pud, addr);
24968+ if (!pmd_present(*pmd))
24969+ continue;
24970+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
24971+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24972+ }
24973+#endif
24974+
24975+ flush_tlb_all();
24976+#endif
24977+
24978 free_init_pages("unused kernel memory",
24979 (unsigned long)(&__init_begin),
24980 (unsigned long)(&__init_end));
24981diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
24982index 30938c1..bda3d5d 100644
24983--- a/arch/x86/mm/init_32.c
24984+++ b/arch/x86/mm/init_32.c
24985@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
24986 }
24987
24988 /*
24989- * Creates a middle page table and puts a pointer to it in the
24990- * given global directory entry. This only returns the gd entry
24991- * in non-PAE compilation mode, since the middle layer is folded.
24992- */
24993-static pmd_t * __init one_md_table_init(pgd_t *pgd)
24994-{
24995- pud_t *pud;
24996- pmd_t *pmd_table;
24997-
24998-#ifdef CONFIG_X86_PAE
24999- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
25000- if (after_bootmem)
25001- pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
25002- else
25003- pmd_table = (pmd_t *)alloc_low_page();
25004- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
25005- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
25006- pud = pud_offset(pgd, 0);
25007- BUG_ON(pmd_table != pmd_offset(pud, 0));
25008-
25009- return pmd_table;
25010- }
25011-#endif
25012- pud = pud_offset(pgd, 0);
25013- pmd_table = pmd_offset(pud, 0);
25014-
25015- return pmd_table;
25016-}
25017-
25018-/*
25019 * Create a page table and place a pointer to it in a middle page
25020 * directory entry:
25021 */
25022@@ -121,13 +91,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
25023 page_table = (pte_t *)alloc_low_page();
25024
25025 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
25026+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25027+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
25028+#else
25029 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
25030+#endif
25031 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
25032 }
25033
25034 return pte_offset_kernel(pmd, 0);
25035 }
25036
25037+static pmd_t * __init one_md_table_init(pgd_t *pgd)
25038+{
25039+ pud_t *pud;
25040+ pmd_t *pmd_table;
25041+
25042+ pud = pud_offset(pgd, 0);
25043+ pmd_table = pmd_offset(pud, 0);
25044+
25045+ return pmd_table;
25046+}
25047+
25048 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
25049 {
25050 int pgd_idx = pgd_index(vaddr);
25051@@ -201,6 +186,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
25052 int pgd_idx, pmd_idx;
25053 unsigned long vaddr;
25054 pgd_t *pgd;
25055+ pud_t *pud;
25056 pmd_t *pmd;
25057 pte_t *pte = NULL;
25058
25059@@ -210,8 +196,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
25060 pgd = pgd_base + pgd_idx;
25061
25062 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
25063- pmd = one_md_table_init(pgd);
25064- pmd = pmd + pmd_index(vaddr);
25065+ pud = pud_offset(pgd, vaddr);
25066+ pmd = pmd_offset(pud, vaddr);
25067+
25068+#ifdef CONFIG_X86_PAE
25069+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
25070+#endif
25071+
25072 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
25073 pmd++, pmd_idx++) {
25074 pte = page_table_kmap_check(one_page_table_init(pmd),
25075@@ -223,11 +214,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
25076 }
25077 }
25078
25079-static inline int is_kernel_text(unsigned long addr)
25080+static inline int is_kernel_text(unsigned long start, unsigned long end)
25081 {
25082- if (addr >= PAGE_OFFSET && addr <= (unsigned long)__init_end)
25083- return 1;
25084- return 0;
25085+ if ((start > ktla_ktva((unsigned long)_etext) ||
25086+ end <= ktla_ktva((unsigned long)_stext)) &&
25087+ (start > ktla_ktva((unsigned long)_einittext) ||
25088+ end <= ktla_ktva((unsigned long)_sinittext)) &&
25089+
25090+#ifdef CONFIG_ACPI_SLEEP
25091+ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
25092+#endif
25093+
25094+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
25095+ return 0;
25096+ return 1;
25097 }
25098
25099 /*
25100@@ -243,9 +243,10 @@ kernel_physical_mapping_init(unsigned long start,
25101 int use_pse = page_size_mask == (1<<PG_LEVEL_2M);
25102 unsigned long start_pfn, end_pfn;
25103 pgd_t *pgd_base = swapper_pg_dir;
25104- int pgd_idx, pmd_idx, pte_ofs;
25105+ unsigned int pgd_idx, pmd_idx, pte_ofs;
25106 unsigned long pfn;
25107 pgd_t *pgd;
25108+ pud_t *pud;
25109 pmd_t *pmd;
25110 pte_t *pte;
25111 unsigned pages_2m, pages_4k;
25112@@ -278,8 +279,13 @@ repeat:
25113 pfn = start_pfn;
25114 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
25115 pgd = pgd_base + pgd_idx;
25116- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
25117- pmd = one_md_table_init(pgd);
25118+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
25119+ pud = pud_offset(pgd, 0);
25120+ pmd = pmd_offset(pud, 0);
25121+
25122+#ifdef CONFIG_X86_PAE
25123+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
25124+#endif
25125
25126 if (pfn >= end_pfn)
25127 continue;
25128@@ -291,14 +297,13 @@ repeat:
25129 #endif
25130 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
25131 pmd++, pmd_idx++) {
25132- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
25133+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
25134
25135 /*
25136 * Map with big pages if possible, otherwise
25137 * create normal page tables:
25138 */
25139 if (use_pse) {
25140- unsigned int addr2;
25141 pgprot_t prot = PAGE_KERNEL_LARGE;
25142 /*
25143 * first pass will use the same initial
25144@@ -308,11 +313,7 @@ repeat:
25145 __pgprot(PTE_IDENT_ATTR |
25146 _PAGE_PSE);
25147
25148- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
25149- PAGE_OFFSET + PAGE_SIZE-1;
25150-
25151- if (is_kernel_text(addr) ||
25152- is_kernel_text(addr2))
25153+ if (is_kernel_text(address, address + PMD_SIZE))
25154 prot = PAGE_KERNEL_LARGE_EXEC;
25155
25156 pages_2m++;
25157@@ -329,7 +330,7 @@ repeat:
25158 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
25159 pte += pte_ofs;
25160 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
25161- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
25162+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
25163 pgprot_t prot = PAGE_KERNEL;
25164 /*
25165 * first pass will use the same initial
25166@@ -337,7 +338,7 @@ repeat:
25167 */
25168 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
25169
25170- if (is_kernel_text(addr))
25171+ if (is_kernel_text(address, address + PAGE_SIZE))
25172 prot = PAGE_KERNEL_EXEC;
25173
25174 pages_4k++;
25175@@ -489,7 +490,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
25176
25177 pud = pud_offset(pgd, va);
25178 pmd = pmd_offset(pud, va);
25179- if (!pmd_present(*pmd))
25180+ if (!pmd_present(*pmd) || pmd_huge(*pmd))
25181 break;
25182
25183 pte = pte_offset_kernel(pmd, va);
25184@@ -541,9 +542,7 @@ void __init early_ioremap_page_table_range_init(void)
25185
25186 static void __init pagetable_init(void)
25187 {
25188- pgd_t *pgd_base = swapper_pg_dir;
25189-
25190- permanent_kmaps_init(pgd_base);
25191+ permanent_kmaps_init(swapper_pg_dir);
25192 }
25193
25194 #ifdef CONFIG_ACPI_SLEEP
25195@@ -551,12 +550,12 @@ static void __init pagetable_init(void)
25196 * ACPI suspend needs this for resume, because things like the intel-agp
25197 * driver might have split up a kernel 4MB mapping.
25198 */
25199-char swsusp_pg_dir[PAGE_SIZE]
25200+pgd_t swsusp_pg_dir[PTRS_PER_PGD]
25201 __attribute__ ((aligned(PAGE_SIZE)));
25202
25203 static inline void save_pg_dir(void)
25204 {
25205- memcpy(swsusp_pg_dir, swapper_pg_dir, PAGE_SIZE);
25206+ clone_pgd_range(swsusp_pg_dir, swapper_pg_dir, PTRS_PER_PGD);
25207 }
25208 #else /* !CONFIG_ACPI_SLEEP */
25209 static inline void save_pg_dir(void)
25210@@ -588,7 +587,7 @@ void zap_low_mappings(bool early)
25211 flush_tlb_all();
25212 }
25213
25214-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
25215+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
25216 EXPORT_SYMBOL_GPL(__supported_pte_mask);
25217
25218 /* user-defined highmem size */
25219@@ -777,7 +776,7 @@ void __init setup_bootmem_allocator(void)
25220 * Initialize the boot-time allocator (with low memory only):
25221 */
25222 bootmap_size = bootmem_bootmap_pages(max_low_pfn)<<PAGE_SHIFT;
25223- bootmap = find_e820_area(0, max_pfn_mapped<<PAGE_SHIFT, bootmap_size,
25224+ bootmap = find_e820_area(0x100000, max_pfn_mapped<<PAGE_SHIFT, bootmap_size,
25225 PAGE_SIZE);
25226 if (bootmap == -1L)
25227 panic("Cannot find bootmem map of size %ld\n", bootmap_size);
25228@@ -864,6 +863,12 @@ void __init mem_init(void)
25229
25230 pci_iommu_alloc();
25231
25232+#ifdef CONFIG_PAX_PER_CPU_PGD
25233+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
25234+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
25235+ KERNEL_PGD_PTRS);
25236+#endif
25237+
25238 #ifdef CONFIG_FLATMEM
25239 BUG_ON(!mem_map);
25240 #endif
25241@@ -881,7 +886,7 @@ void __init mem_init(void)
25242 set_highmem_pages_init();
25243
25244 codesize = (unsigned long) &_etext - (unsigned long) &_text;
25245- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
25246+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
25247 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
25248
25249 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
25250@@ -923,10 +928,10 @@ void __init mem_init(void)
25251 ((unsigned long)&__init_end -
25252 (unsigned long)&__init_begin) >> 10,
25253
25254- (unsigned long)&_etext, (unsigned long)&_edata,
25255- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
25256+ (unsigned long)&_sdata, (unsigned long)&_edata,
25257+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
25258
25259- (unsigned long)&_text, (unsigned long)&_etext,
25260+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
25261 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
25262
25263 /*
25264@@ -1007,6 +1012,7 @@ void set_kernel_text_rw(void)
25265 if (!kernel_set_to_readonly)
25266 return;
25267
25268+ start = ktla_ktva(start);
25269 pr_debug("Set kernel text: %lx - %lx for read write\n",
25270 start, start+size);
25271
25272@@ -1021,6 +1027,7 @@ void set_kernel_text_ro(void)
25273 if (!kernel_set_to_readonly)
25274 return;
25275
25276+ start = ktla_ktva(start);
25277 pr_debug("Set kernel text: %lx - %lx for read only\n",
25278 start, start+size);
25279
25280@@ -1032,6 +1039,7 @@ void mark_rodata_ro(void)
25281 unsigned long start = PFN_ALIGN(_text);
25282 unsigned long size = PFN_ALIGN(_etext) - start;
25283
25284+ start = ktla_ktva(start);
25285 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
25286 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
25287 size >> 10);
25288diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
25289index 7d095ad..25d2549 100644
25290--- a/arch/x86/mm/init_64.c
25291+++ b/arch/x86/mm/init_64.c
25292@@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
25293 pmd = fill_pmd(pud, vaddr);
25294 pte = fill_pte(pmd, vaddr);
25295
25296+ pax_open_kernel();
25297 set_pte(pte, new_pte);
25298+ pax_close_kernel();
25299
25300 /*
25301 * It's enough to flush this one mapping.
25302@@ -223,14 +225,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
25303 pgd = pgd_offset_k((unsigned long)__va(phys));
25304 if (pgd_none(*pgd)) {
25305 pud = (pud_t *) spp_getpage();
25306- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
25307- _PAGE_USER));
25308+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
25309 }
25310 pud = pud_offset(pgd, (unsigned long)__va(phys));
25311 if (pud_none(*pud)) {
25312 pmd = (pmd_t *) spp_getpage();
25313- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
25314- _PAGE_USER));
25315+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
25316 }
25317 pmd = pmd_offset(pud, phys);
25318 BUG_ON(!pmd_none(*pmd));
25319@@ -675,6 +675,12 @@ void __init mem_init(void)
25320
25321 pci_iommu_alloc();
25322
25323+#ifdef CONFIG_PAX_PER_CPU_PGD
25324+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
25325+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
25326+ KERNEL_PGD_PTRS);
25327+#endif
25328+
25329 /* clear_bss() already clear the empty_zero_page */
25330
25331 reservedpages = 0;
25332@@ -861,8 +867,8 @@ int kern_addr_valid(unsigned long addr)
25333 static struct vm_area_struct gate_vma = {
25334 .vm_start = VSYSCALL_START,
25335 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
25336- .vm_page_prot = PAGE_READONLY_EXEC,
25337- .vm_flags = VM_READ | VM_EXEC
25338+ .vm_page_prot = PAGE_READONLY,
25339+ .vm_flags = VM_READ
25340 };
25341
25342 struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
25343@@ -896,7 +902,7 @@ int in_gate_area_no_task(unsigned long addr)
25344
25345 const char *arch_vma_name(struct vm_area_struct *vma)
25346 {
25347- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
25348+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
25349 return "[vdso]";
25350 if (vma == &gate_vma)
25351 return "[vsyscall]";
25352diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
25353index 84e236c..69bd3f6 100644
25354--- a/arch/x86/mm/iomap_32.c
25355+++ b/arch/x86/mm/iomap_32.c
25356@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot)
25357 debug_kmap_atomic(type);
25358 idx = type + KM_TYPE_NR * smp_processor_id();
25359 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
25360+
25361+ pax_open_kernel();
25362 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
25363+ pax_close_kernel();
25364+
25365 arch_flush_lazy_mmu_mode();
25366
25367 return (void *)vaddr;
25368diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
25369index 2feb9bd..ab91e7b 100644
25370--- a/arch/x86/mm/ioremap.c
25371+++ b/arch/x86/mm/ioremap.c
25372@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
25373 * Second special case: Some BIOSen report the PC BIOS
25374 * area (640->1Mb) as ram even though it is not.
25375 */
25376- if (pagenr >= (BIOS_BEGIN >> PAGE_SHIFT) &&
25377- pagenr < (BIOS_END >> PAGE_SHIFT))
25378+ if (pagenr >= (ISA_START_ADDRESS >> PAGE_SHIFT) &&
25379+ pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
25380 return 0;
25381
25382 for (i = 0; i < e820.nr_map; i++) {
25383@@ -137,13 +137,10 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
25384 /*
25385 * Don't allow anybody to remap normal RAM that we're using..
25386 */
25387- for (pfn = phys_addr >> PAGE_SHIFT;
25388- (pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK);
25389- pfn++) {
25390-
25391+ for (pfn = phys_addr >> PAGE_SHIFT; ((resource_size_t)pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK); pfn++) {
25392 int is_ram = page_is_ram(pfn);
25393
25394- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
25395+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
25396 return NULL;
25397 WARN_ON_ONCE(is_ram);
25398 }
25399@@ -378,6 +375,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
25400
25401 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
25402 if (page_is_ram(start >> PAGE_SHIFT))
25403+#ifdef CONFIG_HIGHMEM
25404+ if ((start >> PAGE_SHIFT) < max_low_pfn)
25405+#endif
25406 return __va(phys);
25407
25408 addr = (void __force *)ioremap_default(start, PAGE_SIZE);
25409@@ -407,7 +407,7 @@ static int __init early_ioremap_debug_setup(char *str)
25410 early_param("early_ioremap_debug", early_ioremap_debug_setup);
25411
25412 static __initdata int after_paging_init;
25413-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
25414+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
25415
25416 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
25417 {
25418@@ -439,8 +439,7 @@ void __init early_ioremap_init(void)
25419 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
25420
25421 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
25422- memset(bm_pte, 0, sizeof(bm_pte));
25423- pmd_populate_kernel(&init_mm, pmd, bm_pte);
25424+ pmd_populate_user(&init_mm, pmd, bm_pte);
25425
25426 /*
25427 * The boot-ioremap range spans multiple pmds, for which
25428diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
25429index 8cc1833..1abbc5b 100644
25430--- a/arch/x86/mm/kmemcheck/kmemcheck.c
25431+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
25432@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
25433 * memory (e.g. tracked pages)? For now, we need this to avoid
25434 * invoking kmemcheck for PnP BIOS calls.
25435 */
25436- if (regs->flags & X86_VM_MASK)
25437+ if (v8086_mode(regs))
25438 return false;
25439- if (regs->cs != __KERNEL_CS)
25440+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
25441 return false;
25442
25443 pte = kmemcheck_pte_lookup(address);
25444diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
25445index c9e57af..07a321b 100644
25446--- a/arch/x86/mm/mmap.c
25447+++ b/arch/x86/mm/mmap.c
25448@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size(void)
25449 * Leave an at least ~128 MB hole with possible stack randomization.
25450 */
25451 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
25452-#define MAX_GAP (TASK_SIZE/6*5)
25453+#define MAX_GAP (pax_task_size/6*5)
25454
25455 /*
25456 * True on X86_32 or when emulating IA32 on X86_64
25457@@ -94,27 +94,40 @@ static unsigned long mmap_rnd(void)
25458 return rnd << PAGE_SHIFT;
25459 }
25460
25461-static unsigned long mmap_base(void)
25462+static unsigned long mmap_base(struct mm_struct *mm)
25463 {
25464 unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
25465+ unsigned long pax_task_size = TASK_SIZE;
25466+
25467+#ifdef CONFIG_PAX_SEGMEXEC
25468+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
25469+ pax_task_size = SEGMEXEC_TASK_SIZE;
25470+#endif
25471
25472 if (gap < MIN_GAP)
25473 gap = MIN_GAP;
25474 else if (gap > MAX_GAP)
25475 gap = MAX_GAP;
25476
25477- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
25478+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
25479 }
25480
25481 /*
25482 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
25483 * does, but not when emulating X86_32
25484 */
25485-static unsigned long mmap_legacy_base(void)
25486+static unsigned long mmap_legacy_base(struct mm_struct *mm)
25487 {
25488- if (mmap_is_ia32())
25489+ if (mmap_is_ia32()) {
25490+
25491+#ifdef CONFIG_PAX_SEGMEXEC
25492+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
25493+ return SEGMEXEC_TASK_UNMAPPED_BASE;
25494+ else
25495+#endif
25496+
25497 return TASK_UNMAPPED_BASE;
25498- else
25499+ } else
25500 return TASK_UNMAPPED_BASE + mmap_rnd();
25501 }
25502
25503@@ -125,11 +138,23 @@ static unsigned long mmap_legacy_base(void)
25504 void arch_pick_mmap_layout(struct mm_struct *mm)
25505 {
25506 if (mmap_is_legacy()) {
25507- mm->mmap_base = mmap_legacy_base();
25508+ mm->mmap_base = mmap_legacy_base(mm);
25509+
25510+#ifdef CONFIG_PAX_RANDMMAP
25511+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25512+ mm->mmap_base += mm->delta_mmap;
25513+#endif
25514+
25515 mm->get_unmapped_area = arch_get_unmapped_area;
25516 mm->unmap_area = arch_unmap_area;
25517 } else {
25518- mm->mmap_base = mmap_base();
25519+ mm->mmap_base = mmap_base(mm);
25520+
25521+#ifdef CONFIG_PAX_RANDMMAP
25522+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25523+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
25524+#endif
25525+
25526 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
25527 mm->unmap_area = arch_unmap_area_topdown;
25528 }
25529diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
25530index 132772a..b961f11 100644
25531--- a/arch/x86/mm/mmio-mod.c
25532+++ b/arch/x86/mm/mmio-mod.c
25533@@ -193,7 +193,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
25534 break;
25535 default:
25536 {
25537- unsigned char *ip = (unsigned char *)instptr;
25538+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
25539 my_trace->opcode = MMIO_UNKNOWN_OP;
25540 my_trace->width = 0;
25541 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
25542@@ -233,7 +233,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
25543 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25544 void __iomem *addr)
25545 {
25546- static atomic_t next_id;
25547+ static atomic_unchecked_t next_id;
25548 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
25549 /* These are page-unaligned. */
25550 struct mmiotrace_map map = {
25551@@ -257,7 +257,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25552 .private = trace
25553 },
25554 .phys = offset,
25555- .id = atomic_inc_return(&next_id)
25556+ .id = atomic_inc_return_unchecked(&next_id)
25557 };
25558 map.map_id = trace->id;
25559
25560diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
25561index d253006..e56dd6a 100644
25562--- a/arch/x86/mm/numa_32.c
25563+++ b/arch/x86/mm/numa_32.c
25564@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
25565 }
25566 #endif
25567
25568-extern unsigned long find_max_low_pfn(void);
25569 extern unsigned long highend_pfn, highstart_pfn;
25570
25571 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
25572diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
25573index e1d1069..2251ff3 100644
25574--- a/arch/x86/mm/pageattr-test.c
25575+++ b/arch/x86/mm/pageattr-test.c
25576@@ -36,7 +36,7 @@ enum {
25577
25578 static int pte_testbit(pte_t pte)
25579 {
25580- return pte_flags(pte) & _PAGE_UNUSED1;
25581+ return pte_flags(pte) & _PAGE_CPA_TEST;
25582 }
25583
25584 struct split_state {
25585diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
25586index dd38bfb..b72c63e 100644
25587--- a/arch/x86/mm/pageattr.c
25588+++ b/arch/x86/mm/pageattr.c
25589@@ -261,16 +261,17 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25590 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
25591 */
25592 if (within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
25593- pgprot_val(forbidden) |= _PAGE_NX;
25594+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25595
25596 /*
25597 * The kernel text needs to be executable for obvious reasons
25598 * Does not cover __inittext since that is gone later on. On
25599 * 64bit we do not enforce !NX on the low mapping
25600 */
25601- if (within(address, (unsigned long)_text, (unsigned long)_etext))
25602- pgprot_val(forbidden) |= _PAGE_NX;
25603+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
25604+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25605
25606+#ifdef CONFIG_DEBUG_RODATA
25607 /*
25608 * The .rodata section needs to be read-only. Using the pfn
25609 * catches all aliases.
25610@@ -278,6 +279,14 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25611 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
25612 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
25613 pgprot_val(forbidden) |= _PAGE_RW;
25614+#endif
25615+
25616+#ifdef CONFIG_PAX_KERNEXEC
25617+ if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
25618+ pgprot_val(forbidden) |= _PAGE_RW;
25619+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25620+ }
25621+#endif
25622
25623 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
25624
25625@@ -331,23 +340,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
25626 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
25627 {
25628 /* change init_mm */
25629+ pax_open_kernel();
25630 set_pte_atomic(kpte, pte);
25631+
25632 #ifdef CONFIG_X86_32
25633 if (!SHARED_KERNEL_PMD) {
25634+
25635+#ifdef CONFIG_PAX_PER_CPU_PGD
25636+ unsigned long cpu;
25637+#else
25638 struct page *page;
25639+#endif
25640
25641+#ifdef CONFIG_PAX_PER_CPU_PGD
25642+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
25643+ pgd_t *pgd = get_cpu_pgd(cpu);
25644+#else
25645 list_for_each_entry(page, &pgd_list, lru) {
25646- pgd_t *pgd;
25647+ pgd_t *pgd = (pgd_t *)page_address(page);
25648+#endif
25649+
25650 pud_t *pud;
25651 pmd_t *pmd;
25652
25653- pgd = (pgd_t *)page_address(page) + pgd_index(address);
25654+ pgd += pgd_index(address);
25655 pud = pud_offset(pgd, address);
25656 pmd = pmd_offset(pud, address);
25657 set_pte_atomic((pte_t *)pmd, pte);
25658 }
25659 }
25660 #endif
25661+ pax_close_kernel();
25662 }
25663
25664 static int
25665diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
25666index e78cd0e..de0a817 100644
25667--- a/arch/x86/mm/pat.c
25668+++ b/arch/x86/mm/pat.c
25669@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct memtype *entry, unsigned long *type)
25670
25671 conflict:
25672 printk(KERN_INFO "%s:%d conflicting memory types "
25673- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, new->start,
25674+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), new->start,
25675 new->end, cattr_name(new->type), cattr_name(entry->type));
25676 return -EBUSY;
25677 }
25678@@ -559,7 +559,7 @@ unlock_ret:
25679
25680 if (err) {
25681 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
25682- current->comm, current->pid, start, end);
25683+ current->comm, task_pid_nr(current), start, end);
25684 }
25685
25686 dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end);
25687@@ -689,8 +689,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
25688 while (cursor < to) {
25689 if (!devmem_is_allowed(pfn)) {
25690 printk(KERN_INFO
25691- "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
25692- current->comm, from, to);
25693+ "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
25694+ current->comm, from, to, cursor);
25695 return 0;
25696 }
25697 cursor += PAGE_SIZE;
25698@@ -755,7 +755,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
25699 printk(KERN_INFO
25700 "%s:%d ioremap_change_attr failed %s "
25701 "for %Lx-%Lx\n",
25702- current->comm, current->pid,
25703+ current->comm, task_pid_nr(current),
25704 cattr_name(flags),
25705 base, (unsigned long long)(base + size));
25706 return -EINVAL;
25707@@ -813,7 +813,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25708 free_memtype(paddr, paddr + size);
25709 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
25710 " for %Lx-%Lx, got %s\n",
25711- current->comm, current->pid,
25712+ current->comm, task_pid_nr(current),
25713 cattr_name(want_flags),
25714 (unsigned long long)paddr,
25715 (unsigned long long)(paddr + size),
25716diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
25717index df3d5c8..c2223e1 100644
25718--- a/arch/x86/mm/pf_in.c
25719+++ b/arch/x86/mm/pf_in.c
25720@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
25721 int i;
25722 enum reason_type rv = OTHERS;
25723
25724- p = (unsigned char *)ins_addr;
25725+ p = (unsigned char *)ktla_ktva(ins_addr);
25726 p += skip_prefix(p, &prf);
25727 p += get_opcode(p, &opcode);
25728
25729@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
25730 struct prefix_bits prf;
25731 int i;
25732
25733- p = (unsigned char *)ins_addr;
25734+ p = (unsigned char *)ktla_ktva(ins_addr);
25735 p += skip_prefix(p, &prf);
25736 p += get_opcode(p, &opcode);
25737
25738@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
25739 struct prefix_bits prf;
25740 int i;
25741
25742- p = (unsigned char *)ins_addr;
25743+ p = (unsigned char *)ktla_ktva(ins_addr);
25744 p += skip_prefix(p, &prf);
25745 p += get_opcode(p, &opcode);
25746
25747@@ -417,7 +417,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
25748 int i;
25749 unsigned long rv;
25750
25751- p = (unsigned char *)ins_addr;
25752+ p = (unsigned char *)ktla_ktva(ins_addr);
25753 p += skip_prefix(p, &prf);
25754 p += get_opcode(p, &opcode);
25755 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
25756@@ -472,7 +472,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
25757 int i;
25758 unsigned long rv;
25759
25760- p = (unsigned char *)ins_addr;
25761+ p = (unsigned char *)ktla_ktva(ins_addr);
25762 p += skip_prefix(p, &prf);
25763 p += get_opcode(p, &opcode);
25764 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
25765diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
25766index e0e6fad..c56b495 100644
25767--- a/arch/x86/mm/pgtable.c
25768+++ b/arch/x86/mm/pgtable.c
25769@@ -83,9 +83,52 @@ static inline void pgd_list_del(pgd_t *pgd)
25770 list_del(&page->lru);
25771 }
25772
25773-#define UNSHARED_PTRS_PER_PGD \
25774- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25775+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25776+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
25777
25778+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25779+{
25780+ while (count--)
25781+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
25782+}
25783+#endif
25784+
25785+#ifdef CONFIG_PAX_PER_CPU_PGD
25786+void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25787+{
25788+ while (count--)
25789+
25790+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25791+ *dst++ = __pgd(pgd_val(*src++) & clone_pgd_mask);
25792+#else
25793+ *dst++ = *src++;
25794+#endif
25795+
25796+}
25797+#endif
25798+
25799+#ifdef CONFIG_X86_64
25800+#define pxd_t pud_t
25801+#define pyd_t pgd_t
25802+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
25803+#define pxd_free(mm, pud) pud_free((mm), (pud))
25804+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
25805+#define pyd_offset(mm, address) pgd_offset((mm), (address))
25806+#define PYD_SIZE PGDIR_SIZE
25807+#else
25808+#define pxd_t pmd_t
25809+#define pyd_t pud_t
25810+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
25811+#define pxd_free(mm, pud) pmd_free((mm), (pud))
25812+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
25813+#define pyd_offset(mm, address) pud_offset((mm), (address))
25814+#define PYD_SIZE PUD_SIZE
25815+#endif
25816+
25817+#ifdef CONFIG_PAX_PER_CPU_PGD
25818+static inline void pgd_ctor(pgd_t *pgd) {}
25819+static inline void pgd_dtor(pgd_t *pgd) {}
25820+#else
25821 static void pgd_ctor(pgd_t *pgd)
25822 {
25823 /* If the pgd points to a shared pagetable level (either the
25824@@ -119,6 +162,7 @@ static void pgd_dtor(pgd_t *pgd)
25825 pgd_list_del(pgd);
25826 spin_unlock_irqrestore(&pgd_lock, flags);
25827 }
25828+#endif
25829
25830 /*
25831 * List of all pgd's needed for non-PAE so it can invalidate entries
25832@@ -131,7 +175,7 @@ static void pgd_dtor(pgd_t *pgd)
25833 * -- wli
25834 */
25835
25836-#ifdef CONFIG_X86_PAE
25837+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25838 /*
25839 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
25840 * updating the top-level pagetable entries to guarantee the
25841@@ -143,7 +187,7 @@ static void pgd_dtor(pgd_t *pgd)
25842 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
25843 * and initialize the kernel pmds here.
25844 */
25845-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
25846+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25847
25848 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25849 {
25850@@ -161,36 +205,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25851 */
25852 flush_tlb_mm(mm);
25853 }
25854+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
25855+#define PREALLOCATED_PXDS USER_PGD_PTRS
25856 #else /* !CONFIG_X86_PAE */
25857
25858 /* No need to prepopulate any pagetable entries in non-PAE modes. */
25859-#define PREALLOCATED_PMDS 0
25860+#define PREALLOCATED_PXDS 0
25861
25862 #endif /* CONFIG_X86_PAE */
25863
25864-static void free_pmds(pmd_t *pmds[])
25865+static void free_pxds(pxd_t *pxds[])
25866 {
25867 int i;
25868
25869- for(i = 0; i < PREALLOCATED_PMDS; i++)
25870- if (pmds[i])
25871- free_page((unsigned long)pmds[i]);
25872+ for(i = 0; i < PREALLOCATED_PXDS; i++)
25873+ if (pxds[i])
25874+ free_page((unsigned long)pxds[i]);
25875 }
25876
25877-static int preallocate_pmds(pmd_t *pmds[])
25878+static int preallocate_pxds(pxd_t *pxds[])
25879 {
25880 int i;
25881 bool failed = false;
25882
25883- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25884- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
25885- if (pmd == NULL)
25886+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25887+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
25888+ if (pxd == NULL)
25889 failed = true;
25890- pmds[i] = pmd;
25891+ pxds[i] = pxd;
25892 }
25893
25894 if (failed) {
25895- free_pmds(pmds);
25896+ free_pxds(pxds);
25897 return -ENOMEM;
25898 }
25899
25900@@ -203,51 +249,56 @@ static int preallocate_pmds(pmd_t *pmds[])
25901 * preallocate which never got a corresponding vma will need to be
25902 * freed manually.
25903 */
25904-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
25905+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
25906 {
25907 int i;
25908
25909- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25910+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25911 pgd_t pgd = pgdp[i];
25912
25913 if (pgd_val(pgd) != 0) {
25914- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
25915+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
25916
25917- pgdp[i] = native_make_pgd(0);
25918+ set_pgd(pgdp + i, native_make_pgd(0));
25919
25920- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
25921- pmd_free(mm, pmd);
25922+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
25923+ pxd_free(mm, pxd);
25924 }
25925 }
25926 }
25927
25928-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
25929+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
25930 {
25931- pud_t *pud;
25932+ pyd_t *pyd;
25933 unsigned long addr;
25934 int i;
25935
25936- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
25937+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
25938 return;
25939
25940- pud = pud_offset(pgd, 0);
25941+#ifdef CONFIG_X86_64
25942+ pyd = pyd_offset(mm, 0L);
25943+#else
25944+ pyd = pyd_offset(pgd, 0L);
25945+#endif
25946
25947- for (addr = i = 0; i < PREALLOCATED_PMDS;
25948- i++, pud++, addr += PUD_SIZE) {
25949- pmd_t *pmd = pmds[i];
25950+ for (addr = i = 0; i < PREALLOCATED_PXDS;
25951+ i++, pyd++, addr += PYD_SIZE) {
25952+ pxd_t *pxd = pxds[i];
25953
25954 if (i >= KERNEL_PGD_BOUNDARY)
25955- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25956- sizeof(pmd_t) * PTRS_PER_PMD);
25957+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25958+ sizeof(pxd_t) * PTRS_PER_PMD);
25959
25960- pud_populate(mm, pud, pmd);
25961+ pyd_populate(mm, pyd, pxd);
25962 }
25963 }
25964
25965 pgd_t *pgd_alloc(struct mm_struct *mm)
25966 {
25967 pgd_t *pgd;
25968- pmd_t *pmds[PREALLOCATED_PMDS];
25969+ pxd_t *pxds[PREALLOCATED_PXDS];
25970+
25971 unsigned long flags;
25972
25973 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
25974@@ -257,11 +308,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25975
25976 mm->pgd = pgd;
25977
25978- if (preallocate_pmds(pmds) != 0)
25979+ if (preallocate_pxds(pxds) != 0)
25980 goto out_free_pgd;
25981
25982 if (paravirt_pgd_alloc(mm) != 0)
25983- goto out_free_pmds;
25984+ goto out_free_pxds;
25985
25986 /*
25987 * Make sure that pre-populating the pmds is atomic with
25988@@ -271,14 +322,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25989 spin_lock_irqsave(&pgd_lock, flags);
25990
25991 pgd_ctor(pgd);
25992- pgd_prepopulate_pmd(mm, pgd, pmds);
25993+ pgd_prepopulate_pxd(mm, pgd, pxds);
25994
25995 spin_unlock_irqrestore(&pgd_lock, flags);
25996
25997 return pgd;
25998
25999-out_free_pmds:
26000- free_pmds(pmds);
26001+out_free_pxds:
26002+ free_pxds(pxds);
26003 out_free_pgd:
26004 free_page((unsigned long)pgd);
26005 out:
26006@@ -287,7 +338,7 @@ out:
26007
26008 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
26009 {
26010- pgd_mop_up_pmds(mm, pgd);
26011+ pgd_mop_up_pxds(mm, pgd);
26012 pgd_dtor(pgd);
26013 paravirt_pgd_free(mm, pgd);
26014 free_page((unsigned long)pgd);
26015diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
26016index 46c8834..fcab43d 100644
26017--- a/arch/x86/mm/pgtable_32.c
26018+++ b/arch/x86/mm/pgtable_32.c
26019@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
26020 return;
26021 }
26022 pte = pte_offset_kernel(pmd, vaddr);
26023+
26024+ pax_open_kernel();
26025 if (pte_val(pteval))
26026 set_pte_at(&init_mm, vaddr, pte, pteval);
26027 else
26028 pte_clear(&init_mm, vaddr, pte);
26029+ pax_close_kernel();
26030
26031 /*
26032 * It's enough to flush this one mapping.
26033diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
26034index 513d8ed..978c161 100644
26035--- a/arch/x86/mm/setup_nx.c
26036+++ b/arch/x86/mm/setup_nx.c
26037@@ -4,11 +4,10 @@
26038
26039 #include <asm/pgtable.h>
26040
26041+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26042 int nx_enabled;
26043
26044-#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
26045-static int disable_nx __cpuinitdata;
26046-
26047+#ifndef CONFIG_PAX_PAGEEXEC
26048 /*
26049 * noexec = on|off
26050 *
26051@@ -22,32 +21,26 @@ static int __init noexec_setup(char *str)
26052 if (!str)
26053 return -EINVAL;
26054 if (!strncmp(str, "on", 2)) {
26055- __supported_pte_mask |= _PAGE_NX;
26056- disable_nx = 0;
26057+ nx_enabled = 1;
26058 } else if (!strncmp(str, "off", 3)) {
26059- disable_nx = 1;
26060- __supported_pte_mask &= ~_PAGE_NX;
26061+ nx_enabled = 0;
26062 }
26063 return 0;
26064 }
26065 early_param("noexec", noexec_setup);
26066 #endif
26067+#endif
26068
26069 #ifdef CONFIG_X86_PAE
26070 void __init set_nx(void)
26071 {
26072- unsigned int v[4], l, h;
26073+ if (!nx_enabled && cpu_has_nx) {
26074+ unsigned l, h;
26075
26076- if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) {
26077- cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]);
26078-
26079- if ((v[3] & (1 << 20)) && !disable_nx) {
26080- rdmsr(MSR_EFER, l, h);
26081- l |= EFER_NX;
26082- wrmsr(MSR_EFER, l, h);
26083- nx_enabled = 1;
26084- __supported_pte_mask |= _PAGE_NX;
26085- }
26086+ __supported_pte_mask &= ~_PAGE_NX;
26087+ rdmsr(MSR_EFER, l, h);
26088+ l &= ~EFER_NX;
26089+ wrmsr(MSR_EFER, l, h);
26090 }
26091 }
26092 #else
26093@@ -62,7 +55,7 @@ void __cpuinit check_efer(void)
26094 unsigned long efer;
26095
26096 rdmsrl(MSR_EFER, efer);
26097- if (!(efer & EFER_NX) || disable_nx)
26098+ if (!(efer & EFER_NX) || !nx_enabled)
26099 __supported_pte_mask &= ~_PAGE_NX;
26100 }
26101 #endif
26102diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
26103index 36fe08e..b123d3a 100644
26104--- a/arch/x86/mm/tlb.c
26105+++ b/arch/x86/mm/tlb.c
26106@@ -61,7 +61,11 @@ void leave_mm(int cpu)
26107 BUG();
26108 cpumask_clear_cpu(cpu,
26109 mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
26110+
26111+#ifndef CONFIG_PAX_PER_CPU_PGD
26112 load_cr3(swapper_pg_dir);
26113+#endif
26114+
26115 }
26116 EXPORT_SYMBOL_GPL(leave_mm);
26117
26118diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
26119index 829edf0..672adb3 100644
26120--- a/arch/x86/oprofile/backtrace.c
26121+++ b/arch/x86/oprofile/backtrace.c
26122@@ -115,7 +115,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
26123 {
26124 struct frame_head *head = (struct frame_head *)frame_pointer(regs);
26125
26126- if (!user_mode_vm(regs)) {
26127+ if (!user_mode(regs)) {
26128 unsigned long stack = kernel_stack_pointer(regs);
26129 if (depth)
26130 dump_trace(NULL, regs, (unsigned long *)stack, 0,
26131diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
26132index e6a160a..36deff6 100644
26133--- a/arch/x86/oprofile/op_model_p4.c
26134+++ b/arch/x86/oprofile/op_model_p4.c
26135@@ -50,7 +50,7 @@ static inline void setup_num_counters(void)
26136 #endif
26137 }
26138
26139-static int inline addr_increment(void)
26140+static inline int addr_increment(void)
26141 {
26142 #ifdef CONFIG_SMP
26143 return smp_num_siblings == 2 ? 2 : 1;
26144diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
26145index 1331fcf..03901b2 100644
26146--- a/arch/x86/pci/common.c
26147+++ b/arch/x86/pci/common.c
26148@@ -31,8 +31,8 @@ int noioapicreroute = 1;
26149 int pcibios_last_bus = -1;
26150 unsigned long pirq_table_addr;
26151 struct pci_bus *pci_root_bus;
26152-struct pci_raw_ops *raw_pci_ops;
26153-struct pci_raw_ops *raw_pci_ext_ops;
26154+const struct pci_raw_ops *raw_pci_ops;
26155+const struct pci_raw_ops *raw_pci_ext_ops;
26156
26157 int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
26158 int reg, int len, u32 *val)
26159diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c
26160index 347d882..4baf6b6 100644
26161--- a/arch/x86/pci/direct.c
26162+++ b/arch/x86/pci/direct.c
26163@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int seg, unsigned int bus,
26164
26165 #undef PCI_CONF1_ADDRESS
26166
26167-struct pci_raw_ops pci_direct_conf1 = {
26168+const struct pci_raw_ops pci_direct_conf1 = {
26169 .read = pci_conf1_read,
26170 .write = pci_conf1_write,
26171 };
26172@@ -173,7 +173,7 @@ static int pci_conf2_write(unsigned int seg, unsigned int bus,
26173
26174 #undef PCI_CONF2_ADDRESS
26175
26176-struct pci_raw_ops pci_direct_conf2 = {
26177+const struct pci_raw_ops pci_direct_conf2 = {
26178 .read = pci_conf2_read,
26179 .write = pci_conf2_write,
26180 };
26181@@ -189,7 +189,7 @@ struct pci_raw_ops pci_direct_conf2 = {
26182 * This should be close to trivial, but it isn't, because there are buggy
26183 * chipsets (yes, you guessed it, by Intel and Compaq) that have no class ID.
26184 */
26185-static int __init pci_sanity_check(struct pci_raw_ops *o)
26186+static int __init pci_sanity_check(const struct pci_raw_ops *o)
26187 {
26188 u32 x = 0;
26189 int year, devfn;
26190diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
26191index f10a7e9..0425342 100644
26192--- a/arch/x86/pci/mmconfig_32.c
26193+++ b/arch/x86/pci/mmconfig_32.c
26194@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
26195 return 0;
26196 }
26197
26198-static struct pci_raw_ops pci_mmcfg = {
26199+static const struct pci_raw_ops pci_mmcfg = {
26200 .read = pci_mmcfg_read,
26201 .write = pci_mmcfg_write,
26202 };
26203diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
26204index 94349f8..41600a7 100644
26205--- a/arch/x86/pci/mmconfig_64.c
26206+++ b/arch/x86/pci/mmconfig_64.c
26207@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
26208 return 0;
26209 }
26210
26211-static struct pci_raw_ops pci_mmcfg = {
26212+static const struct pci_raw_ops pci_mmcfg = {
26213 .read = pci_mmcfg_read,
26214 .write = pci_mmcfg_write,
26215 };
26216diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c
26217index 8eb295e..86bd657 100644
26218--- a/arch/x86/pci/numaq_32.c
26219+++ b/arch/x86/pci/numaq_32.c
26220@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned int seg, unsigned int bus,
26221
26222 #undef PCI_CONF1_MQ_ADDRESS
26223
26224-static struct pci_raw_ops pci_direct_conf1_mq = {
26225+static const struct pci_raw_ops pci_direct_conf1_mq = {
26226 .read = pci_conf1_mq_read,
26227 .write = pci_conf1_mq_write
26228 };
26229diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c
26230index b889d82..5a58a0a 100644
26231--- a/arch/x86/pci/olpc.c
26232+++ b/arch/x86/pci/olpc.c
26233@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int seg, unsigned int bus,
26234 return 0;
26235 }
26236
26237-static struct pci_raw_ops pci_olpc_conf = {
26238+static const struct pci_raw_ops pci_olpc_conf = {
26239 .read = pci_olpc_read,
26240 .write = pci_olpc_write,
26241 };
26242diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
26243index 1c975cc..b8e16c2 100644
26244--- a/arch/x86/pci/pcbios.c
26245+++ b/arch/x86/pci/pcbios.c
26246@@ -56,50 +56,93 @@ union bios32 {
26247 static struct {
26248 unsigned long address;
26249 unsigned short segment;
26250-} bios32_indirect = { 0, __KERNEL_CS };
26251+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
26252
26253 /*
26254 * Returns the entry point for the given service, NULL on error
26255 */
26256
26257-static unsigned long bios32_service(unsigned long service)
26258+static unsigned long __devinit bios32_service(unsigned long service)
26259 {
26260 unsigned char return_code; /* %al */
26261 unsigned long address; /* %ebx */
26262 unsigned long length; /* %ecx */
26263 unsigned long entry; /* %edx */
26264 unsigned long flags;
26265+ struct desc_struct d, *gdt;
26266
26267 local_irq_save(flags);
26268- __asm__("lcall *(%%edi); cld"
26269+
26270+ gdt = get_cpu_gdt_table(smp_processor_id());
26271+
26272+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
26273+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
26274+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
26275+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
26276+
26277+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
26278 : "=a" (return_code),
26279 "=b" (address),
26280 "=c" (length),
26281 "=d" (entry)
26282 : "0" (service),
26283 "1" (0),
26284- "D" (&bios32_indirect));
26285+ "D" (&bios32_indirect),
26286+ "r"(__PCIBIOS_DS)
26287+ : "memory");
26288+
26289+ pax_open_kernel();
26290+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
26291+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
26292+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
26293+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
26294+ pax_close_kernel();
26295+
26296 local_irq_restore(flags);
26297
26298 switch (return_code) {
26299- case 0:
26300- return address + entry;
26301- case 0x80: /* Not present */
26302- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
26303- return 0;
26304- default: /* Shouldn't happen */
26305- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
26306- service, return_code);
26307+ case 0: {
26308+ int cpu;
26309+ unsigned char flags;
26310+
26311+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
26312+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
26313+ printk(KERN_WARNING "bios32_service: not valid\n");
26314 return 0;
26315+ }
26316+ address = address + PAGE_OFFSET;
26317+ length += 16UL; /* some BIOSs underreport this... */
26318+ flags = 4;
26319+ if (length >= 64*1024*1024) {
26320+ length >>= PAGE_SHIFT;
26321+ flags |= 8;
26322+ }
26323+
26324+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
26325+ gdt = get_cpu_gdt_table(cpu);
26326+ pack_descriptor(&d, address, length, 0x9b, flags);
26327+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
26328+ pack_descriptor(&d, address, length, 0x93, flags);
26329+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
26330+ }
26331+ return entry;
26332+ }
26333+ case 0x80: /* Not present */
26334+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
26335+ return 0;
26336+ default: /* Shouldn't happen */
26337+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
26338+ service, return_code);
26339+ return 0;
26340 }
26341 }
26342
26343 static struct {
26344 unsigned long address;
26345 unsigned short segment;
26346-} pci_indirect = { 0, __KERNEL_CS };
26347+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
26348
26349-static int pci_bios_present;
26350+static int pci_bios_present __read_only;
26351
26352 static int __devinit check_pcibios(void)
26353 {
26354@@ -108,11 +151,13 @@ static int __devinit check_pcibios(void)
26355 unsigned long flags, pcibios_entry;
26356
26357 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
26358- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
26359+ pci_indirect.address = pcibios_entry;
26360
26361 local_irq_save(flags);
26362- __asm__(
26363- "lcall *(%%edi); cld\n\t"
26364+ __asm__("movw %w6, %%ds\n\t"
26365+ "lcall *%%ss:(%%edi); cld\n\t"
26366+ "push %%ss\n\t"
26367+ "pop %%ds\n\t"
26368 "jc 1f\n\t"
26369 "xor %%ah, %%ah\n"
26370 "1:"
26371@@ -121,7 +166,8 @@ static int __devinit check_pcibios(void)
26372 "=b" (ebx),
26373 "=c" (ecx)
26374 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
26375- "D" (&pci_indirect)
26376+ "D" (&pci_indirect),
26377+ "r" (__PCIBIOS_DS)
26378 : "memory");
26379 local_irq_restore(flags);
26380
26381@@ -165,7 +211,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26382
26383 switch (len) {
26384 case 1:
26385- __asm__("lcall *(%%esi); cld\n\t"
26386+ __asm__("movw %w6, %%ds\n\t"
26387+ "lcall *%%ss:(%%esi); cld\n\t"
26388+ "push %%ss\n\t"
26389+ "pop %%ds\n\t"
26390 "jc 1f\n\t"
26391 "xor %%ah, %%ah\n"
26392 "1:"
26393@@ -174,7 +223,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26394 : "1" (PCIBIOS_READ_CONFIG_BYTE),
26395 "b" (bx),
26396 "D" ((long)reg),
26397- "S" (&pci_indirect));
26398+ "S" (&pci_indirect),
26399+ "r" (__PCIBIOS_DS));
26400 /*
26401 * Zero-extend the result beyond 8 bits, do not trust the
26402 * BIOS having done it:
26403@@ -182,7 +232,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26404 *value &= 0xff;
26405 break;
26406 case 2:
26407- __asm__("lcall *(%%esi); cld\n\t"
26408+ __asm__("movw %w6, %%ds\n\t"
26409+ "lcall *%%ss:(%%esi); cld\n\t"
26410+ "push %%ss\n\t"
26411+ "pop %%ds\n\t"
26412 "jc 1f\n\t"
26413 "xor %%ah, %%ah\n"
26414 "1:"
26415@@ -191,7 +244,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26416 : "1" (PCIBIOS_READ_CONFIG_WORD),
26417 "b" (bx),
26418 "D" ((long)reg),
26419- "S" (&pci_indirect));
26420+ "S" (&pci_indirect),
26421+ "r" (__PCIBIOS_DS));
26422 /*
26423 * Zero-extend the result beyond 16 bits, do not trust the
26424 * BIOS having done it:
26425@@ -199,7 +253,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26426 *value &= 0xffff;
26427 break;
26428 case 4:
26429- __asm__("lcall *(%%esi); cld\n\t"
26430+ __asm__("movw %w6, %%ds\n\t"
26431+ "lcall *%%ss:(%%esi); cld\n\t"
26432+ "push %%ss\n\t"
26433+ "pop %%ds\n\t"
26434 "jc 1f\n\t"
26435 "xor %%ah, %%ah\n"
26436 "1:"
26437@@ -208,7 +265,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26438 : "1" (PCIBIOS_READ_CONFIG_DWORD),
26439 "b" (bx),
26440 "D" ((long)reg),
26441- "S" (&pci_indirect));
26442+ "S" (&pci_indirect),
26443+ "r" (__PCIBIOS_DS));
26444 break;
26445 }
26446
26447@@ -231,7 +289,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26448
26449 switch (len) {
26450 case 1:
26451- __asm__("lcall *(%%esi); cld\n\t"
26452+ __asm__("movw %w6, %%ds\n\t"
26453+ "lcall *%%ss:(%%esi); cld\n\t"
26454+ "push %%ss\n\t"
26455+ "pop %%ds\n\t"
26456 "jc 1f\n\t"
26457 "xor %%ah, %%ah\n"
26458 "1:"
26459@@ -240,10 +301,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26460 "c" (value),
26461 "b" (bx),
26462 "D" ((long)reg),
26463- "S" (&pci_indirect));
26464+ "S" (&pci_indirect),
26465+ "r" (__PCIBIOS_DS));
26466 break;
26467 case 2:
26468- __asm__("lcall *(%%esi); cld\n\t"
26469+ __asm__("movw %w6, %%ds\n\t"
26470+ "lcall *%%ss:(%%esi); cld\n\t"
26471+ "push %%ss\n\t"
26472+ "pop %%ds\n\t"
26473 "jc 1f\n\t"
26474 "xor %%ah, %%ah\n"
26475 "1:"
26476@@ -252,10 +317,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26477 "c" (value),
26478 "b" (bx),
26479 "D" ((long)reg),
26480- "S" (&pci_indirect));
26481+ "S" (&pci_indirect),
26482+ "r" (__PCIBIOS_DS));
26483 break;
26484 case 4:
26485- __asm__("lcall *(%%esi); cld\n\t"
26486+ __asm__("movw %w6, %%ds\n\t"
26487+ "lcall *%%ss:(%%esi); cld\n\t"
26488+ "push %%ss\n\t"
26489+ "pop %%ds\n\t"
26490 "jc 1f\n\t"
26491 "xor %%ah, %%ah\n"
26492 "1:"
26493@@ -264,7 +333,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26494 "c" (value),
26495 "b" (bx),
26496 "D" ((long)reg),
26497- "S" (&pci_indirect));
26498+ "S" (&pci_indirect),
26499+ "r" (__PCIBIOS_DS));
26500 break;
26501 }
26502
26503@@ -278,7 +348,7 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26504 * Function table for BIOS32 access
26505 */
26506
26507-static struct pci_raw_ops pci_bios_access = {
26508+static const struct pci_raw_ops pci_bios_access = {
26509 .read = pci_bios_read,
26510 .write = pci_bios_write
26511 };
26512@@ -287,7 +357,7 @@ static struct pci_raw_ops pci_bios_access = {
26513 * Try to find PCI BIOS.
26514 */
26515
26516-static struct pci_raw_ops * __devinit pci_find_bios(void)
26517+static const struct pci_raw_ops * __devinit pci_find_bios(void)
26518 {
26519 union bios32 *check;
26520 unsigned char sum;
26521@@ -368,10 +438,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26522
26523 DBG("PCI: Fetching IRQ routing table... ");
26524 __asm__("push %%es\n\t"
26525+ "movw %w8, %%ds\n\t"
26526 "push %%ds\n\t"
26527 "pop %%es\n\t"
26528- "lcall *(%%esi); cld\n\t"
26529+ "lcall *%%ss:(%%esi); cld\n\t"
26530 "pop %%es\n\t"
26531+ "push %%ss\n\t"
26532+ "pop %%ds\n"
26533 "jc 1f\n\t"
26534 "xor %%ah, %%ah\n"
26535 "1:"
26536@@ -382,7 +455,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26537 "1" (0),
26538 "D" ((long) &opt),
26539 "S" (&pci_indirect),
26540- "m" (opt)
26541+ "m" (opt),
26542+ "r" (__PCIBIOS_DS)
26543 : "memory");
26544 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
26545 if (ret & 0xff00)
26546@@ -406,7 +480,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26547 {
26548 int ret;
26549
26550- __asm__("lcall *(%%esi); cld\n\t"
26551+ __asm__("movw %w5, %%ds\n\t"
26552+ "lcall *%%ss:(%%esi); cld\n\t"
26553+ "push %%ss\n\t"
26554+ "pop %%ds\n"
26555 "jc 1f\n\t"
26556 "xor %%ah, %%ah\n"
26557 "1:"
26558@@ -414,7 +491,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26559 : "0" (PCIBIOS_SET_PCI_HW_INT),
26560 "b" ((dev->bus->number << 8) | dev->devfn),
26561 "c" ((irq << 8) | (pin + 10)),
26562- "S" (&pci_indirect));
26563+ "S" (&pci_indirect),
26564+ "r" (__PCIBIOS_DS));
26565 return !(ret & 0xff00);
26566 }
26567 EXPORT_SYMBOL(pcibios_set_irq_routing);
26568diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
26569index fa0f651..9d8f3d9 100644
26570--- a/arch/x86/power/cpu.c
26571+++ b/arch/x86/power/cpu.c
26572@@ -129,7 +129,7 @@ static void do_fpu_end(void)
26573 static void fix_processor_context(void)
26574 {
26575 int cpu = smp_processor_id();
26576- struct tss_struct *t = &per_cpu(init_tss, cpu);
26577+ struct tss_struct *t = init_tss + cpu;
26578
26579 set_tss_desc(cpu, t); /*
26580 * This just modifies memory; should not be
26581@@ -139,7 +139,9 @@ static void fix_processor_context(void)
26582 */
26583
26584 #ifdef CONFIG_X86_64
26585+ pax_open_kernel();
26586 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
26587+ pax_close_kernel();
26588
26589 syscall_init(); /* This sets MSR_*STAR and related */
26590 #endif
26591diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
26592index dd78ef6..f9d928d 100644
26593--- a/arch/x86/vdso/Makefile
26594+++ b/arch/x86/vdso/Makefile
26595@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
26596 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
26597 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
26598
26599-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26600+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26601 GCOV_PROFILE := n
26602
26603 #
26604diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
26605index ee55754..0013b2e 100644
26606--- a/arch/x86/vdso/vclock_gettime.c
26607+++ b/arch/x86/vdso/vclock_gettime.c
26608@@ -22,24 +22,48 @@
26609 #include <asm/hpet.h>
26610 #include <asm/unistd.h>
26611 #include <asm/io.h>
26612+#include <asm/fixmap.h>
26613 #include "vextern.h"
26614
26615 #define gtod vdso_vsyscall_gtod_data
26616
26617+notrace noinline long __vdso_fallback_time(long *t)
26618+{
26619+ long secs;
26620+ asm volatile("syscall"
26621+ : "=a" (secs)
26622+ : "0" (__NR_time),"D" (t) : "r11", "cx", "memory");
26623+ return secs;
26624+}
26625+
26626 notrace static long vdso_fallback_gettime(long clock, struct timespec *ts)
26627 {
26628 long ret;
26629 asm("syscall" : "=a" (ret) :
26630- "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "memory");
26631+ "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "r11", "cx", "memory");
26632 return ret;
26633 }
26634
26635+notrace static inline cycle_t __vdso_vread_hpet(void)
26636+{
26637+ return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
26638+}
26639+
26640+notrace static inline cycle_t __vdso_vread_tsc(void)
26641+{
26642+ cycle_t ret = (cycle_t)vget_cycles();
26643+
26644+ return ret >= gtod->clock.cycle_last ? ret : gtod->clock.cycle_last;
26645+}
26646+
26647 notrace static inline long vgetns(void)
26648 {
26649 long v;
26650- cycles_t (*vread)(void);
26651- vread = gtod->clock.vread;
26652- v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask;
26653+ if (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3])
26654+ v = __vdso_vread_tsc();
26655+ else
26656+ v = __vdso_vread_hpet();
26657+ v = (v - gtod->clock.cycle_last) & gtod->clock.mask;
26658 return (v * gtod->clock.mult) >> gtod->clock.shift;
26659 }
26660
26661@@ -113,7 +137,9 @@ notrace static noinline int do_monotonic_coarse(struct timespec *ts)
26662
26663 notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
26664 {
26665- if (likely(gtod->sysctl_enabled))
26666+ if (likely(gtod->sysctl_enabled &&
26667+ ((gtod->clock.name[0] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) ||
26668+ (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3]))))
26669 switch (clock) {
26670 case CLOCK_REALTIME:
26671 if (likely(gtod->clock.vread))
26672@@ -133,10 +159,20 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
26673 int clock_gettime(clockid_t, struct timespec *)
26674 __attribute__((weak, alias("__vdso_clock_gettime")));
26675
26676+notrace noinline int __vdso_fallback_gettimeofday(struct timeval *tv, struct timezone *tz)
26677+{
26678+ long ret;
26679+ asm("syscall" : "=a" (ret) :
26680+ "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "r11", "cx", "memory");
26681+ return ret;
26682+}
26683+
26684 notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
26685 {
26686- long ret;
26687- if (likely(gtod->sysctl_enabled && gtod->clock.vread)) {
26688+ if (likely(gtod->sysctl_enabled &&
26689+ ((gtod->clock.name[0] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) ||
26690+ (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3]))))
26691+ {
26692 if (likely(tv != NULL)) {
26693 BUILD_BUG_ON(offsetof(struct timeval, tv_usec) !=
26694 offsetof(struct timespec, tv_nsec) ||
26695@@ -151,9 +187,7 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
26696 }
26697 return 0;
26698 }
26699- asm("syscall" : "=a" (ret) :
26700- "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "memory");
26701- return ret;
26702+ return __vdso_fallback_gettimeofday(tv, tz);
26703 }
26704 int gettimeofday(struct timeval *, struct timezone *)
26705 __attribute__((weak, alias("__vdso_gettimeofday")));
26706diff --git a/arch/x86/vdso/vdso.lds.S b/arch/x86/vdso/vdso.lds.S
26707index 4e5dd3b..00ba15e 100644
26708--- a/arch/x86/vdso/vdso.lds.S
26709+++ b/arch/x86/vdso/vdso.lds.S
26710@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
26711 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
26712 #include "vextern.h"
26713 #undef VEXTERN
26714+
26715+#define VEXTERN(x) VDSO64_ ## x = __vdso_ ## x;
26716+VEXTERN(fallback_gettimeofday)
26717+VEXTERN(fallback_time)
26718+VEXTERN(getcpu)
26719+#undef VEXTERN
26720diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
26721index 58bc00f..d53fb48 100644
26722--- a/arch/x86/vdso/vdso32-setup.c
26723+++ b/arch/x86/vdso/vdso32-setup.c
26724@@ -25,6 +25,7 @@
26725 #include <asm/tlbflush.h>
26726 #include <asm/vdso.h>
26727 #include <asm/proto.h>
26728+#include <asm/mman.h>
26729
26730 enum {
26731 VDSO_DISABLED = 0,
26732@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
26733 void enable_sep_cpu(void)
26734 {
26735 int cpu = get_cpu();
26736- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26737+ struct tss_struct *tss = init_tss + cpu;
26738
26739 if (!boot_cpu_has(X86_FEATURE_SEP)) {
26740 put_cpu();
26741@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
26742 gate_vma.vm_start = FIXADDR_USER_START;
26743 gate_vma.vm_end = FIXADDR_USER_END;
26744 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
26745- gate_vma.vm_page_prot = __P101;
26746+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
26747 /*
26748 * Make sure the vDSO gets into every core dump.
26749 * Dumping its contents makes post-mortem fully interpretable later
26750@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26751 if (compat)
26752 addr = VDSO_HIGH_BASE;
26753 else {
26754- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
26755+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
26756 if (IS_ERR_VALUE(addr)) {
26757 ret = addr;
26758 goto up_fail;
26759 }
26760 }
26761
26762- current->mm->context.vdso = (void *)addr;
26763+ current->mm->context.vdso = addr;
26764
26765 if (compat_uses_vma || !compat) {
26766 /*
26767@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26768 }
26769
26770 current_thread_info()->sysenter_return =
26771- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26772+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26773
26774 up_fail:
26775 if (ret)
26776- current->mm->context.vdso = NULL;
26777+ current->mm->context.vdso = 0;
26778
26779 up_write(&mm->mmap_sem);
26780
26781@@ -413,8 +414,14 @@ __initcall(ia32_binfmt_init);
26782
26783 const char *arch_vma_name(struct vm_area_struct *vma)
26784 {
26785- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
26786+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
26787 return "[vdso]";
26788+
26789+#ifdef CONFIG_PAX_SEGMEXEC
26790+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
26791+ return "[vdso]";
26792+#endif
26793+
26794 return NULL;
26795 }
26796
26797@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
26798 struct mm_struct *mm = tsk->mm;
26799
26800 /* Check to see if this task was created in compat vdso mode */
26801- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
26802+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
26803 return &gate_vma;
26804 return NULL;
26805 }
26806diff --git a/arch/x86/vdso/vextern.h b/arch/x86/vdso/vextern.h
26807index 1683ba2..48d07f3 100644
26808--- a/arch/x86/vdso/vextern.h
26809+++ b/arch/x86/vdso/vextern.h
26810@@ -11,6 +11,5 @@
26811 put into vextern.h and be referenced as a pointer with vdso prefix.
26812 The main kernel later fills in the values. */
26813
26814-VEXTERN(jiffies)
26815 VEXTERN(vgetcpu_mode)
26816 VEXTERN(vsyscall_gtod_data)
26817diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
26818index 21e1aeb..2c0b3c4 100644
26819--- a/arch/x86/vdso/vma.c
26820+++ b/arch/x86/vdso/vma.c
26821@@ -17,8 +17,6 @@
26822 #include "vextern.h" /* Just for VMAGIC. */
26823 #undef VEXTERN
26824
26825-unsigned int __read_mostly vdso_enabled = 1;
26826-
26827 extern char vdso_start[], vdso_end[];
26828 extern unsigned short vdso_sync_cpuid;
26829
26830@@ -27,10 +25,8 @@ static unsigned vdso_size;
26831
26832 static inline void *var_ref(void *p, char *name)
26833 {
26834- if (*(void **)p != (void *)VMAGIC) {
26835- printk("VDSO: variable %s broken\n", name);
26836- vdso_enabled = 0;
26837- }
26838+ if (*(void **)p != (void *)VMAGIC)
26839+ panic("VDSO: variable %s broken\n", name);
26840 return p;
26841 }
26842
26843@@ -57,21 +53,18 @@ static int __init init_vdso_vars(void)
26844 if (!vbase)
26845 goto oom;
26846
26847- if (memcmp(vbase, "\177ELF", 4)) {
26848- printk("VDSO: I'm broken; not ELF\n");
26849- vdso_enabled = 0;
26850- }
26851+ if (memcmp(vbase, ELFMAG, SELFMAG))
26852+ panic("VDSO: I'm broken; not ELF\n");
26853
26854 #define VEXTERN(x) \
26855 *(typeof(__ ## x) **) var_ref(VDSO64_SYMBOL(vbase, x), #x) = &__ ## x;
26856 #include "vextern.h"
26857 #undef VEXTERN
26858+ vunmap(vbase);
26859 return 0;
26860
26861 oom:
26862- printk("Cannot allocate vdso\n");
26863- vdso_enabled = 0;
26864- return -ENOMEM;
26865+ panic("Cannot allocate vdso\n");
26866 }
26867 __initcall(init_vdso_vars);
26868
26869@@ -102,13 +95,15 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26870 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26871 {
26872 struct mm_struct *mm = current->mm;
26873- unsigned long addr;
26874+ unsigned long addr = 0;
26875 int ret;
26876
26877- if (!vdso_enabled)
26878- return 0;
26879-
26880 down_write(&mm->mmap_sem);
26881+
26882+#ifdef CONFIG_PAX_RANDMMAP
26883+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26884+#endif
26885+
26886 addr = vdso_addr(mm->start_stack, vdso_size);
26887 addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
26888 if (IS_ERR_VALUE(addr)) {
26889@@ -116,7 +111,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26890 goto up_fail;
26891 }
26892
26893- current->mm->context.vdso = (void *)addr;
26894+ current->mm->context.vdso = addr;
26895
26896 ret = install_special_mapping(mm, addr, vdso_size,
26897 VM_READ|VM_EXEC|
26898@@ -124,7 +119,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26899 VM_ALWAYSDUMP,
26900 vdso_pages);
26901 if (ret) {
26902- current->mm->context.vdso = NULL;
26903+ current->mm->context.vdso = 0;
26904 goto up_fail;
26905 }
26906
26907@@ -132,10 +127,3 @@ up_fail:
26908 up_write(&mm->mmap_sem);
26909 return ret;
26910 }
26911-
26912-static __init int vdso_setup(char *s)
26913-{
26914- vdso_enabled = simple_strtoul(s, NULL, 0);
26915- return 0;
26916-}
26917-__setup("vdso=", vdso_setup);
26918diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
26919index 0087b00..eecb34f 100644
26920--- a/arch/x86/xen/enlighten.c
26921+++ b/arch/x86/xen/enlighten.c
26922@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
26923
26924 struct shared_info xen_dummy_shared_info;
26925
26926-void *xen_initial_gdt;
26927-
26928 /*
26929 * Point at some empty memory to start with. We map the real shared_info
26930 * page as soon as fixmap is up and running.
26931@@ -548,7 +546,7 @@ static void xen_write_idt_entry(gate_desc *dt, int entrynum, const gate_desc *g)
26932
26933 preempt_disable();
26934
26935- start = __get_cpu_var(idt_desc).address;
26936+ start = (unsigned long)__get_cpu_var(idt_desc).address;
26937 end = start + __get_cpu_var(idt_desc).size + 1;
26938
26939 xen_mc_flush();
26940@@ -993,7 +991,7 @@ static const struct pv_apic_ops xen_apic_ops __initdata = {
26941 #endif
26942 };
26943
26944-static void xen_reboot(int reason)
26945+static __noreturn void xen_reboot(int reason)
26946 {
26947 struct sched_shutdown r = { .reason = reason };
26948
26949@@ -1001,17 +999,17 @@ static void xen_reboot(int reason)
26950 BUG();
26951 }
26952
26953-static void xen_restart(char *msg)
26954+static __noreturn void xen_restart(char *msg)
26955 {
26956 xen_reboot(SHUTDOWN_reboot);
26957 }
26958
26959-static void xen_emergency_restart(void)
26960+static __noreturn void xen_emergency_restart(void)
26961 {
26962 xen_reboot(SHUTDOWN_reboot);
26963 }
26964
26965-static void xen_machine_halt(void)
26966+static __noreturn void xen_machine_halt(void)
26967 {
26968 xen_reboot(SHUTDOWN_poweroff);
26969 }
26970@@ -1095,9 +1093,20 @@ asmlinkage void __init xen_start_kernel(void)
26971 */
26972 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
26973
26974-#ifdef CONFIG_X86_64
26975 /* Work out if we support NX */
26976- check_efer();
26977+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
26978+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
26979+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
26980+ unsigned l, h;
26981+
26982+#ifdef CONFIG_X86_PAE
26983+ nx_enabled = 1;
26984+#endif
26985+ __supported_pte_mask |= _PAGE_NX;
26986+ rdmsr(MSR_EFER, l, h);
26987+ l |= EFER_NX;
26988+ wrmsr(MSR_EFER, l, h);
26989+ }
26990 #endif
26991
26992 xen_setup_features();
26993@@ -1129,13 +1138,6 @@ asmlinkage void __init xen_start_kernel(void)
26994
26995 machine_ops = xen_machine_ops;
26996
26997- /*
26998- * The only reliable way to retain the initial address of the
26999- * percpu gdt_page is to remember it here, so we can go and
27000- * mark it RW later, when the initial percpu area is freed.
27001- */
27002- xen_initial_gdt = &per_cpu(gdt_page, 0);
27003-
27004 xen_smp_init();
27005
27006 pgd = (pgd_t *)xen_start_info->pt_base;
27007diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
27008index 3f90a2c..2c2ad84 100644
27009--- a/arch/x86/xen/mmu.c
27010+++ b/arch/x86/xen/mmu.c
27011@@ -1719,6 +1719,9 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
27012 convert_pfn_mfn(init_level4_pgt);
27013 convert_pfn_mfn(level3_ident_pgt);
27014 convert_pfn_mfn(level3_kernel_pgt);
27015+ convert_pfn_mfn(level3_vmalloc_start_pgt);
27016+ convert_pfn_mfn(level3_vmalloc_end_pgt);
27017+ convert_pfn_mfn(level3_vmemmap_pgt);
27018
27019 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
27020 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
27021@@ -1737,7 +1740,11 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
27022 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
27023 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
27024 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
27025+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
27026+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
27027+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
27028 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
27029+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
27030 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
27031 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
27032
27033@@ -1860,6 +1867,7 @@ static __init void xen_post_allocator_init(void)
27034 pv_mmu_ops.set_pud = xen_set_pud;
27035 #if PAGETABLE_LEVELS == 4
27036 pv_mmu_ops.set_pgd = xen_set_pgd;
27037+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
27038 #endif
27039
27040 /* This will work as long as patching hasn't happened yet
27041@@ -1946,6 +1954,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = {
27042 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
27043 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
27044 .set_pgd = xen_set_pgd_hyper,
27045+ .set_pgd_batched = xen_set_pgd_hyper,
27046
27047 .alloc_pud = xen_alloc_pmd_init,
27048 .release_pud = xen_release_pmd_init,
27049diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
27050index a96204a..fca9b8e 100644
27051--- a/arch/x86/xen/smp.c
27052+++ b/arch/x86/xen/smp.c
27053@@ -168,11 +168,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
27054 {
27055 BUG_ON(smp_processor_id() != 0);
27056 native_smp_prepare_boot_cpu();
27057-
27058- /* We've switched to the "real" per-cpu gdt, so make sure the
27059- old memory can be recycled */
27060- make_lowmem_page_readwrite(xen_initial_gdt);
27061-
27062 xen_setup_vcpu_info_placement();
27063 }
27064
27065@@ -241,12 +236,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
27066 gdt = get_cpu_gdt_table(cpu);
27067
27068 ctxt->flags = VGCF_IN_KERNEL;
27069- ctxt->user_regs.ds = __USER_DS;
27070- ctxt->user_regs.es = __USER_DS;
27071+ ctxt->user_regs.ds = __KERNEL_DS;
27072+ ctxt->user_regs.es = __KERNEL_DS;
27073 ctxt->user_regs.ss = __KERNEL_DS;
27074 #ifdef CONFIG_X86_32
27075 ctxt->user_regs.fs = __KERNEL_PERCPU;
27076- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
27077+ savesegment(gs, ctxt->user_regs.gs);
27078 #else
27079 ctxt->gs_base_kernel = per_cpu_offset(cpu);
27080 #endif
27081@@ -297,13 +292,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
27082 int rc;
27083
27084 per_cpu(current_task, cpu) = idle;
27085+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27086 #ifdef CONFIG_X86_32
27087 irq_ctx_init(cpu);
27088 #else
27089 clear_tsk_thread_flag(idle, TIF_FORK);
27090- per_cpu(kernel_stack, cpu) =
27091- (unsigned long)task_stack_page(idle) -
27092- KERNEL_STACK_OFFSET + THREAD_SIZE;
27093+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27094 #endif
27095 xen_setup_runstate_info(cpu);
27096 xen_setup_timer(cpu);
27097diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
27098index 9a95a9c..4f39e774 100644
27099--- a/arch/x86/xen/xen-asm_32.S
27100+++ b/arch/x86/xen/xen-asm_32.S
27101@@ -83,14 +83,14 @@ ENTRY(xen_iret)
27102 ESP_OFFSET=4 # bytes pushed onto stack
27103
27104 /*
27105- * Store vcpu_info pointer for easy access. Do it this way to
27106- * avoid having to reload %fs
27107+ * Store vcpu_info pointer for easy access.
27108 */
27109 #ifdef CONFIG_SMP
27110- GET_THREAD_INFO(%eax)
27111- movl TI_cpu(%eax), %eax
27112- movl __per_cpu_offset(,%eax,4), %eax
27113- mov per_cpu__xen_vcpu(%eax), %eax
27114+ push %fs
27115+ mov $(__KERNEL_PERCPU), %eax
27116+ mov %eax, %fs
27117+ mov PER_CPU_VAR(xen_vcpu), %eax
27118+ pop %fs
27119 #else
27120 movl per_cpu__xen_vcpu, %eax
27121 #endif
27122diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
27123index 1a5ff24..a187d40 100644
27124--- a/arch/x86/xen/xen-head.S
27125+++ b/arch/x86/xen/xen-head.S
27126@@ -19,6 +19,17 @@ ENTRY(startup_xen)
27127 #ifdef CONFIG_X86_32
27128 mov %esi,xen_start_info
27129 mov $init_thread_union+THREAD_SIZE,%esp
27130+#ifdef CONFIG_SMP
27131+ movl $cpu_gdt_table,%edi
27132+ movl $__per_cpu_load,%eax
27133+ movw %ax,__KERNEL_PERCPU + 2(%edi)
27134+ rorl $16,%eax
27135+ movb %al,__KERNEL_PERCPU + 4(%edi)
27136+ movb %ah,__KERNEL_PERCPU + 7(%edi)
27137+ movl $__per_cpu_end - 1,%eax
27138+ subl $__per_cpu_start,%eax
27139+ movw %ax,__KERNEL_PERCPU + 0(%edi)
27140+#endif
27141 #else
27142 mov %rsi,xen_start_info
27143 mov $init_thread_union+THREAD_SIZE,%rsp
27144diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
27145index f9153a3..51eab3d 100644
27146--- a/arch/x86/xen/xen-ops.h
27147+++ b/arch/x86/xen/xen-ops.h
27148@@ -10,8 +10,6 @@
27149 extern const char xen_hypervisor_callback[];
27150 extern const char xen_failsafe_callback[];
27151
27152-extern void *xen_initial_gdt;
27153-
27154 struct trap_info;
27155 void xen_copy_trap_info(struct trap_info *traps);
27156
27157diff --git a/block/blk-integrity.c b/block/blk-integrity.c
27158index 15c6308..96e83c2 100644
27159--- a/block/blk-integrity.c
27160+++ b/block/blk-integrity.c
27161@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs[] = {
27162 NULL,
27163 };
27164
27165-static struct sysfs_ops integrity_ops = {
27166+static const struct sysfs_ops integrity_ops = {
27167 .show = &integrity_attr_show,
27168 .store = &integrity_attr_store,
27169 };
27170diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
27171index ca56420..f2fc409 100644
27172--- a/block/blk-iopoll.c
27173+++ b/block/blk-iopoll.c
27174@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
27175 }
27176 EXPORT_SYMBOL(blk_iopoll_complete);
27177
27178-static void blk_iopoll_softirq(struct softirq_action *h)
27179+static void blk_iopoll_softirq(void)
27180 {
27181 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
27182 int rearm = 0, budget = blk_iopoll_budget;
27183diff --git a/block/blk-map.c b/block/blk-map.c
27184index 30a7e51..0aeec6a 100644
27185--- a/block/blk-map.c
27186+++ b/block/blk-map.c
27187@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct request_queue *q, struct request *rq,
27188 * direct dma. else, set up kernel bounce buffers
27189 */
27190 uaddr = (unsigned long) ubuf;
27191- if (blk_rq_aligned(q, ubuf, len) && !map_data)
27192+ if (blk_rq_aligned(q, (__force void *)ubuf, len) && !map_data)
27193 bio = bio_map_user(q, NULL, uaddr, len, reading, gfp_mask);
27194 else
27195 bio = bio_copy_user(q, map_data, uaddr, len, reading, gfp_mask);
27196@@ -201,12 +201,13 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
27197 for (i = 0; i < iov_count; i++) {
27198 unsigned long uaddr = (unsigned long)iov[i].iov_base;
27199
27200+ if (!iov[i].iov_len)
27201+ return -EINVAL;
27202+
27203 if (uaddr & queue_dma_alignment(q)) {
27204 unaligned = 1;
27205 break;
27206 }
27207- if (!iov[i].iov_len)
27208- return -EINVAL;
27209 }
27210
27211 if (unaligned || (q->dma_pad_mask & len) || map_data)
27212@@ -299,7 +300,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
27213 if (!len || !kbuf)
27214 return -EINVAL;
27215
27216- do_copy = !blk_rq_aligned(q, kbuf, len) || object_is_on_stack(kbuf);
27217+ do_copy = !blk_rq_aligned(q, kbuf, len) || object_starts_on_stack(kbuf);
27218 if (do_copy)
27219 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
27220 else
27221diff --git a/block/blk-softirq.c b/block/blk-softirq.c
27222index ee9c216..58d410a 100644
27223--- a/block/blk-softirq.c
27224+++ b/block/blk-softirq.c
27225@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
27226 * Softirq action handler - move entries to local list and loop over them
27227 * while passing them to the queue registered handler.
27228 */
27229-static void blk_done_softirq(struct softirq_action *h)
27230+static void blk_done_softirq(void)
27231 {
27232 struct list_head *cpu_list, local_list;
27233
27234diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
27235index bb9c5ea..5330d48 100644
27236--- a/block/blk-sysfs.c
27237+++ b/block/blk-sysfs.c
27238@@ -414,7 +414,7 @@ static void blk_release_queue(struct kobject *kobj)
27239 kmem_cache_free(blk_requestq_cachep, q);
27240 }
27241
27242-static struct sysfs_ops queue_sysfs_ops = {
27243+static const struct sysfs_ops queue_sysfs_ops = {
27244 .show = queue_attr_show,
27245 .store = queue_attr_store,
27246 };
27247diff --git a/block/bsg.c b/block/bsg.c
27248index 7154a7a..08ac2f0 100644
27249--- a/block/bsg.c
27250+++ b/block/bsg.c
27251@@ -175,16 +175,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
27252 struct sg_io_v4 *hdr, struct bsg_device *bd,
27253 fmode_t has_write_perm)
27254 {
27255+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27256+ unsigned char *cmdptr;
27257+
27258 if (hdr->request_len > BLK_MAX_CDB) {
27259 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
27260 if (!rq->cmd)
27261 return -ENOMEM;
27262- }
27263+ cmdptr = rq->cmd;
27264+ } else
27265+ cmdptr = tmpcmd;
27266
27267- if (copy_from_user(rq->cmd, (void *)(unsigned long)hdr->request,
27268+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
27269 hdr->request_len))
27270 return -EFAULT;
27271
27272+ if (cmdptr != rq->cmd)
27273+ memcpy(rq->cmd, cmdptr, hdr->request_len);
27274+
27275 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
27276 if (blk_verify_command(rq->cmd, has_write_perm))
27277 return -EPERM;
27278@@ -282,7 +290,7 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,
27279 rq->next_rq = next_rq;
27280 next_rq->cmd_type = rq->cmd_type;
27281
27282- dxferp = (void*)(unsigned long)hdr->din_xferp;
27283+ dxferp = (void __user *)(unsigned long)hdr->din_xferp;
27284 ret = blk_rq_map_user(q, next_rq, NULL, dxferp,
27285 hdr->din_xfer_len, GFP_KERNEL);
27286 if (ret)
27287@@ -291,10 +299,10 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,
27288
27289 if (hdr->dout_xfer_len) {
27290 dxfer_len = hdr->dout_xfer_len;
27291- dxferp = (void*)(unsigned long)hdr->dout_xferp;
27292+ dxferp = (void __user *)(unsigned long)hdr->dout_xferp;
27293 } else if (hdr->din_xfer_len) {
27294 dxfer_len = hdr->din_xfer_len;
27295- dxferp = (void*)(unsigned long)hdr->din_xferp;
27296+ dxferp = (void __user *)(unsigned long)hdr->din_xferp;
27297 } else
27298 dxfer_len = 0;
27299
27300@@ -436,7 +444,7 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,
27301 int len = min_t(unsigned int, hdr->max_response_len,
27302 rq->sense_len);
27303
27304- ret = copy_to_user((void*)(unsigned long)hdr->response,
27305+ ret = copy_to_user((void __user *)(unsigned long)hdr->response,
27306 rq->sense, len);
27307 if (!ret)
27308 hdr->response_len = len;
27309diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
27310index 9bd086c..ca1fc22 100644
27311--- a/block/compat_ioctl.c
27312+++ b/block/compat_ioctl.c
27313@@ -354,7 +354,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
27314 err |= __get_user(f->spec1, &uf->spec1);
27315 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
27316 err |= __get_user(name, &uf->name);
27317- f->name = compat_ptr(name);
27318+ f->name = (void __force_kernel *)compat_ptr(name);
27319 if (err) {
27320 err = -EFAULT;
27321 goto out;
27322diff --git a/block/elevator.c b/block/elevator.c
27323index a847046..75a1746 100644
27324--- a/block/elevator.c
27325+++ b/block/elevator.c
27326@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, struct attribute *attr,
27327 return error;
27328 }
27329
27330-static struct sysfs_ops elv_sysfs_ops = {
27331+static const struct sysfs_ops elv_sysfs_ops = {
27332 .show = elv_attr_show,
27333 .store = elv_attr_store,
27334 };
27335diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
27336index 2be0a97..bded3fd 100644
27337--- a/block/scsi_ioctl.c
27338+++ b/block/scsi_ioctl.c
27339@@ -221,8 +221,20 @@ EXPORT_SYMBOL(blk_verify_command);
27340 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
27341 struct sg_io_hdr *hdr, fmode_t mode)
27342 {
27343- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
27344+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27345+ unsigned char *cmdptr;
27346+
27347+ if (rq->cmd != rq->__cmd)
27348+ cmdptr = rq->cmd;
27349+ else
27350+ cmdptr = tmpcmd;
27351+
27352+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
27353 return -EFAULT;
27354+
27355+ if (cmdptr != rq->cmd)
27356+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
27357+
27358 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
27359 return -EPERM;
27360
27361@@ -431,6 +443,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27362 int err;
27363 unsigned int in_len, out_len, bytes, opcode, cmdlen;
27364 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
27365+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27366+ unsigned char *cmdptr;
27367
27368 if (!sic)
27369 return -EINVAL;
27370@@ -464,9 +478,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27371 */
27372 err = -EFAULT;
27373 rq->cmd_len = cmdlen;
27374- if (copy_from_user(rq->cmd, sic->data, cmdlen))
27375+
27376+ if (rq->cmd != rq->__cmd)
27377+ cmdptr = rq->cmd;
27378+ else
27379+ cmdptr = tmpcmd;
27380+
27381+ if (copy_from_user(cmdptr, sic->data, cmdlen))
27382 goto error;
27383
27384+ if (rq->cmd != cmdptr)
27385+ memcpy(rq->cmd, cmdptr, cmdlen);
27386+
27387 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
27388 goto error;
27389
27390diff --git a/crypto/cryptd.c b/crypto/cryptd.c
27391index 3533582..f143117 100644
27392--- a/crypto/cryptd.c
27393+++ b/crypto/cryptd.c
27394@@ -50,7 +50,7 @@ struct cryptd_blkcipher_ctx {
27395
27396 struct cryptd_blkcipher_request_ctx {
27397 crypto_completion_t complete;
27398-};
27399+} __no_const;
27400
27401 struct cryptd_hash_ctx {
27402 struct crypto_shash *child;
27403diff --git a/crypto/gf128mul.c b/crypto/gf128mul.c
27404index a90d260..7a9765e 100644
27405--- a/crypto/gf128mul.c
27406+++ b/crypto/gf128mul.c
27407@@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 *b)
27408 for (i = 0; i < 7; ++i)
27409 gf128mul_x_lle(&p[i + 1], &p[i]);
27410
27411- memset(r, 0, sizeof(r));
27412+ memset(r, 0, sizeof(*r));
27413 for (i = 0;;) {
27414 u8 ch = ((u8 *)b)[15 - i];
27415
27416@@ -220,7 +220,7 @@ void gf128mul_bbe(be128 *r, const be128 *b)
27417 for (i = 0; i < 7; ++i)
27418 gf128mul_x_bbe(&p[i + 1], &p[i]);
27419
27420- memset(r, 0, sizeof(r));
27421+ memset(r, 0, sizeof(*r));
27422 for (i = 0;;) {
27423 u8 ch = ((u8 *)b)[i];
27424
27425diff --git a/crypto/serpent.c b/crypto/serpent.c
27426index b651a55..023297d 100644
27427--- a/crypto/serpent.c
27428+++ b/crypto/serpent.c
27429@@ -21,6 +21,7 @@
27430 #include <asm/byteorder.h>
27431 #include <linux/crypto.h>
27432 #include <linux/types.h>
27433+#include <linux/sched.h>
27434
27435 /* Key is padded to the maximum of 256 bits before round key generation.
27436 * Any key length <= 256 bits (32 bytes) is allowed by the algorithm.
27437@@ -224,6 +225,8 @@ static int serpent_setkey(struct crypto_tfm *tfm, const u8 *key,
27438 u32 r0,r1,r2,r3,r4;
27439 int i;
27440
27441+ pax_track_stack();
27442+
27443 /* Copy key, add padding */
27444
27445 for (i = 0; i < keylen; ++i)
27446diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
27447index 0d2cdb8..d8de48d 100644
27448--- a/drivers/acpi/acpi_pad.c
27449+++ b/drivers/acpi/acpi_pad.c
27450@@ -30,7 +30,7 @@
27451 #include <acpi/acpi_bus.h>
27452 #include <acpi/acpi_drivers.h>
27453
27454-#define ACPI_PROCESSOR_AGGREGATOR_CLASS "processor_aggregator"
27455+#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
27456 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
27457 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
27458 static DEFINE_MUTEX(isolated_cpus_lock);
27459diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
27460index 3f4602b..2e41d36 100644
27461--- a/drivers/acpi/battery.c
27462+++ b/drivers/acpi/battery.c
27463@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
27464 }
27465
27466 static struct battery_file {
27467- struct file_operations ops;
27468+ const struct file_operations ops;
27469 mode_t mode;
27470 const char *name;
27471 } acpi_battery_file[] = {
27472diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
27473index 7338b6a..82f0257 100644
27474--- a/drivers/acpi/dock.c
27475+++ b/drivers/acpi/dock.c
27476@@ -77,7 +77,7 @@ struct dock_dependent_device {
27477 struct list_head list;
27478 struct list_head hotplug_list;
27479 acpi_handle handle;
27480- struct acpi_dock_ops *ops;
27481+ const struct acpi_dock_ops *ops;
27482 void *context;
27483 };
27484
27485@@ -605,7 +605,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifier);
27486 * the dock driver after _DCK is executed.
27487 */
27488 int
27489-register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
27490+register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock_ops *ops,
27491 void *context)
27492 {
27493 struct dock_dependent_device *dd;
27494diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
27495index 7c1c59e..2993595 100644
27496--- a/drivers/acpi/osl.c
27497+++ b/drivers/acpi/osl.c
27498@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
27499 void __iomem *virt_addr;
27500
27501 virt_addr = ioremap(phys_addr, width);
27502+ if (!virt_addr)
27503+ return AE_NO_MEMORY;
27504 if (!value)
27505 value = &dummy;
27506
27507@@ -551,6 +553,8 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
27508 void __iomem *virt_addr;
27509
27510 virt_addr = ioremap(phys_addr, width);
27511+ if (!virt_addr)
27512+ return AE_NO_MEMORY;
27513
27514 switch (width) {
27515 case 8:
27516diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
27517index c216062..eec10d2 100644
27518--- a/drivers/acpi/power_meter.c
27519+++ b/drivers/acpi/power_meter.c
27520@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
27521 return res;
27522
27523 temp /= 1000;
27524- if (temp < 0)
27525- return -EINVAL;
27526
27527 mutex_lock(&resource->lock);
27528 resource->trip[attr->index - 7] = temp;
27529diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
27530index d0d25e2..961643d 100644
27531--- a/drivers/acpi/proc.c
27532+++ b/drivers/acpi/proc.c
27533@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct file *file,
27534 size_t count, loff_t * ppos)
27535 {
27536 struct list_head *node, *next;
27537- char strbuf[5];
27538- char str[5] = "";
27539- unsigned int len = count;
27540+ char strbuf[5] = {0};
27541 struct acpi_device *found_dev = NULL;
27542
27543- if (len > 4)
27544- len = 4;
27545- if (len < 0)
27546- return -EFAULT;
27547+ if (count > 4)
27548+ count = 4;
27549
27550- if (copy_from_user(strbuf, buffer, len))
27551+ if (copy_from_user(strbuf, buffer, count))
27552 return -EFAULT;
27553- strbuf[len] = '\0';
27554- sscanf(strbuf, "%s", str);
27555+ strbuf[count] = '\0';
27556
27557 mutex_lock(&acpi_device_lock);
27558 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
27559@@ -413,7 +408,7 @@ acpi_system_write_wakeup_device(struct file *file,
27560 if (!dev->wakeup.flags.valid)
27561 continue;
27562
27563- if (!strncmp(dev->pnp.bus_id, str, 4)) {
27564+ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
27565 dev->wakeup.state.enabled =
27566 dev->wakeup.state.enabled ? 0 : 1;
27567 found_dev = dev;
27568diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
27569index 7102474..de8ad22 100644
27570--- a/drivers/acpi/processor_core.c
27571+++ b/drivers/acpi/processor_core.c
27572@@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
27573 return 0;
27574 }
27575
27576- BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
27577+ BUG_ON(pr->id >= nr_cpu_ids);
27578
27579 /*
27580 * Buggy BIOS check
27581diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
27582index d933980..5761f13 100644
27583--- a/drivers/acpi/sbshc.c
27584+++ b/drivers/acpi/sbshc.c
27585@@ -17,7 +17,7 @@
27586
27587 #define PREFIX "ACPI: "
27588
27589-#define ACPI_SMB_HC_CLASS "smbus_host_controller"
27590+#define ACPI_SMB_HC_CLASS "smbus_host_ctl"
27591 #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
27592
27593 struct acpi_smb_hc {
27594diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
27595index 0458094..6978e7b 100644
27596--- a/drivers/acpi/sleep.c
27597+++ b/drivers/acpi/sleep.c
27598@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(suspend_state_t pm_state)
27599 }
27600 }
27601
27602-static struct platform_suspend_ops acpi_suspend_ops = {
27603+static const struct platform_suspend_ops acpi_suspend_ops = {
27604 .valid = acpi_suspend_state_valid,
27605 .begin = acpi_suspend_begin,
27606 .prepare_late = acpi_pm_prepare,
27607@@ -311,7 +311,7 @@ static int acpi_suspend_begin_old(suspend_state_t pm_state)
27608 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
27609 * been requested.
27610 */
27611-static struct platform_suspend_ops acpi_suspend_ops_old = {
27612+static const struct platform_suspend_ops acpi_suspend_ops_old = {
27613 .valid = acpi_suspend_state_valid,
27614 .begin = acpi_suspend_begin_old,
27615 .prepare_late = acpi_pm_disable_gpes,
27616@@ -460,7 +460,7 @@ static void acpi_pm_enable_gpes(void)
27617 acpi_enable_all_runtime_gpes();
27618 }
27619
27620-static struct platform_hibernation_ops acpi_hibernation_ops = {
27621+static const struct platform_hibernation_ops acpi_hibernation_ops = {
27622 .begin = acpi_hibernation_begin,
27623 .end = acpi_pm_end,
27624 .pre_snapshot = acpi_hibernation_pre_snapshot,
27625@@ -513,7 +513,7 @@ static int acpi_hibernation_pre_snapshot_old(void)
27626 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
27627 * been requested.
27628 */
27629-static struct platform_hibernation_ops acpi_hibernation_ops_old = {
27630+static const struct platform_hibernation_ops acpi_hibernation_ops_old = {
27631 .begin = acpi_hibernation_begin_old,
27632 .end = acpi_pm_end,
27633 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
27634diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
27635index 05dff63..b662ab7 100644
27636--- a/drivers/acpi/video.c
27637+++ b/drivers/acpi/video.c
27638@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(struct backlight_device *bd)
27639 vd->brightness->levels[request_level]);
27640 }
27641
27642-static struct backlight_ops acpi_backlight_ops = {
27643+static const struct backlight_ops acpi_backlight_ops = {
27644 .get_brightness = acpi_video_get_brightness,
27645 .update_status = acpi_video_set_brightness,
27646 };
27647diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
27648index 6787aab..23ffb0e 100644
27649--- a/drivers/ata/ahci.c
27650+++ b/drivers/ata/ahci.c
27651@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sht = {
27652 .sdev_attrs = ahci_sdev_attrs,
27653 };
27654
27655-static struct ata_port_operations ahci_ops = {
27656+static const struct ata_port_operations ahci_ops = {
27657 .inherits = &sata_pmp_port_ops,
27658
27659 .qc_defer = sata_pmp_qc_defer_cmd_switch,
27660@@ -424,17 +424,17 @@ static struct ata_port_operations ahci_ops = {
27661 .port_stop = ahci_port_stop,
27662 };
27663
27664-static struct ata_port_operations ahci_vt8251_ops = {
27665+static const struct ata_port_operations ahci_vt8251_ops = {
27666 .inherits = &ahci_ops,
27667 .hardreset = ahci_vt8251_hardreset,
27668 };
27669
27670-static struct ata_port_operations ahci_p5wdh_ops = {
27671+static const struct ata_port_operations ahci_p5wdh_ops = {
27672 .inherits = &ahci_ops,
27673 .hardreset = ahci_p5wdh_hardreset,
27674 };
27675
27676-static struct ata_port_operations ahci_sb600_ops = {
27677+static const struct ata_port_operations ahci_sb600_ops = {
27678 .inherits = &ahci_ops,
27679 .softreset = ahci_sb600_softreset,
27680 .pmp_softreset = ahci_sb600_softreset,
27681diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
27682index 99e7196..4968c77 100644
27683--- a/drivers/ata/ata_generic.c
27684+++ b/drivers/ata/ata_generic.c
27685@@ -104,7 +104,7 @@ static struct scsi_host_template generic_sht = {
27686 ATA_BMDMA_SHT(DRV_NAME),
27687 };
27688
27689-static struct ata_port_operations generic_port_ops = {
27690+static const struct ata_port_operations generic_port_ops = {
27691 .inherits = &ata_bmdma_port_ops,
27692 .cable_detect = ata_cable_unknown,
27693 .set_mode = generic_set_mode,
27694diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
27695index c33591d..000c121 100644
27696--- a/drivers/ata/ata_piix.c
27697+++ b/drivers/ata/ata_piix.c
27698@@ -318,7 +318,7 @@ static struct scsi_host_template piix_sht = {
27699 ATA_BMDMA_SHT(DRV_NAME),
27700 };
27701
27702-static struct ata_port_operations piix_pata_ops = {
27703+static const struct ata_port_operations piix_pata_ops = {
27704 .inherits = &ata_bmdma32_port_ops,
27705 .cable_detect = ata_cable_40wire,
27706 .set_piomode = piix_set_piomode,
27707@@ -326,22 +326,22 @@ static struct ata_port_operations piix_pata_ops = {
27708 .prereset = piix_pata_prereset,
27709 };
27710
27711-static struct ata_port_operations piix_vmw_ops = {
27712+static const struct ata_port_operations piix_vmw_ops = {
27713 .inherits = &piix_pata_ops,
27714 .bmdma_status = piix_vmw_bmdma_status,
27715 };
27716
27717-static struct ata_port_operations ich_pata_ops = {
27718+static const struct ata_port_operations ich_pata_ops = {
27719 .inherits = &piix_pata_ops,
27720 .cable_detect = ich_pata_cable_detect,
27721 .set_dmamode = ich_set_dmamode,
27722 };
27723
27724-static struct ata_port_operations piix_sata_ops = {
27725+static const struct ata_port_operations piix_sata_ops = {
27726 .inherits = &ata_bmdma_port_ops,
27727 };
27728
27729-static struct ata_port_operations piix_sidpr_sata_ops = {
27730+static const struct ata_port_operations piix_sidpr_sata_ops = {
27731 .inherits = &piix_sata_ops,
27732 .hardreset = sata_std_hardreset,
27733 .scr_read = piix_sidpr_scr_read,
27734diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
27735index b0882cd..c295d65 100644
27736--- a/drivers/ata/libata-acpi.c
27737+++ b/drivers/ata/libata-acpi.c
27738@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_handle handle, u32 event, void *data)
27739 ata_acpi_uevent(dev->link->ap, dev, event);
27740 }
27741
27742-static struct acpi_dock_ops ata_acpi_dev_dock_ops = {
27743+static const struct acpi_dock_ops ata_acpi_dev_dock_ops = {
27744 .handler = ata_acpi_dev_notify_dock,
27745 .uevent = ata_acpi_dev_uevent,
27746 };
27747
27748-static struct acpi_dock_ops ata_acpi_ap_dock_ops = {
27749+static const struct acpi_dock_ops ata_acpi_ap_dock_ops = {
27750 .handler = ata_acpi_ap_notify_dock,
27751 .uevent = ata_acpi_ap_uevent,
27752 };
27753diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
27754index d4f7f99..94f603e 100644
27755--- a/drivers/ata/libata-core.c
27756+++ b/drivers/ata/libata-core.c
27757@@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
27758 struct ata_port *ap;
27759 unsigned int tag;
27760
27761- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27762+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27763 ap = qc->ap;
27764
27765 qc->flags = 0;
27766@@ -4970,7 +4970,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
27767 struct ata_port *ap;
27768 struct ata_link *link;
27769
27770- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27771+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27772 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
27773 ap = qc->ap;
27774 link = qc->dev->link;
27775@@ -5987,7 +5987,7 @@ static void ata_host_stop(struct device *gendev, void *res)
27776 * LOCKING:
27777 * None.
27778 */
27779-static void ata_finalize_port_ops(struct ata_port_operations *ops)
27780+static void ata_finalize_port_ops(const struct ata_port_operations *ops)
27781 {
27782 static DEFINE_SPINLOCK(lock);
27783 const struct ata_port_operations *cur;
27784@@ -5999,6 +5999,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27785 return;
27786
27787 spin_lock(&lock);
27788+ pax_open_kernel();
27789
27790 for (cur = ops->inherits; cur; cur = cur->inherits) {
27791 void **inherit = (void **)cur;
27792@@ -6012,8 +6013,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27793 if (IS_ERR(*pp))
27794 *pp = NULL;
27795
27796- ops->inherits = NULL;
27797+ *(struct ata_port_operations **)&ops->inherits = NULL;
27798
27799+ pax_close_kernel();
27800 spin_unlock(&lock);
27801 }
27802
27803@@ -6110,7 +6112,7 @@ int ata_host_start(struct ata_host *host)
27804 */
27805 /* KILLME - the only user left is ipr */
27806 void ata_host_init(struct ata_host *host, struct device *dev,
27807- unsigned long flags, struct ata_port_operations *ops)
27808+ unsigned long flags, const struct ata_port_operations *ops)
27809 {
27810 spin_lock_init(&host->lock);
27811 host->dev = dev;
27812@@ -6773,7 +6775,7 @@ static void ata_dummy_error_handler(struct ata_port *ap)
27813 /* truly dummy */
27814 }
27815
27816-struct ata_port_operations ata_dummy_port_ops = {
27817+const struct ata_port_operations ata_dummy_port_ops = {
27818 .qc_prep = ata_noop_qc_prep,
27819 .qc_issue = ata_dummy_qc_issue,
27820 .error_handler = ata_dummy_error_handler,
27821diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
27822index e5bdb9b..45a8e72 100644
27823--- a/drivers/ata/libata-eh.c
27824+++ b/drivers/ata/libata-eh.c
27825@@ -2423,6 +2423,8 @@ void ata_eh_report(struct ata_port *ap)
27826 {
27827 struct ata_link *link;
27828
27829+ pax_track_stack();
27830+
27831 ata_for_each_link(link, ap, HOST_FIRST)
27832 ata_eh_link_report(link);
27833 }
27834@@ -3594,7 +3596,7 @@ void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
27835 */
27836 void ata_std_error_handler(struct ata_port *ap)
27837 {
27838- struct ata_port_operations *ops = ap->ops;
27839+ const struct ata_port_operations *ops = ap->ops;
27840 ata_reset_fn_t hardreset = ops->hardreset;
27841
27842 /* ignore built-in hardreset if SCR access is not available */
27843diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
27844index 51f0ffb..19ce3e3 100644
27845--- a/drivers/ata/libata-pmp.c
27846+++ b/drivers/ata/libata-pmp.c
27847@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(struct ata_link *link, int *link_tries)
27848 */
27849 static int sata_pmp_eh_recover(struct ata_port *ap)
27850 {
27851- struct ata_port_operations *ops = ap->ops;
27852+ const struct ata_port_operations *ops = ap->ops;
27853 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
27854 struct ata_link *pmp_link = &ap->link;
27855 struct ata_device *pmp_dev = pmp_link->device;
27856diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
27857index d8f35fe..288180a 100644
27858--- a/drivers/ata/pata_acpi.c
27859+++ b/drivers/ata/pata_acpi.c
27860@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_sht = {
27861 ATA_BMDMA_SHT(DRV_NAME),
27862 };
27863
27864-static struct ata_port_operations pacpi_ops = {
27865+static const struct ata_port_operations pacpi_ops = {
27866 .inherits = &ata_bmdma_port_ops,
27867 .qc_issue = pacpi_qc_issue,
27868 .cable_detect = pacpi_cable_detect,
27869diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
27870index 9434114..1f2f364 100644
27871--- a/drivers/ata/pata_ali.c
27872+++ b/drivers/ata/pata_ali.c
27873@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht = {
27874 * Port operations for PIO only ALi
27875 */
27876
27877-static struct ata_port_operations ali_early_port_ops = {
27878+static const struct ata_port_operations ali_early_port_ops = {
27879 .inherits = &ata_sff_port_ops,
27880 .cable_detect = ata_cable_40wire,
27881 .set_piomode = ali_set_piomode,
27882@@ -382,7 +382,7 @@ static const struct ata_port_operations ali_dma_base_ops = {
27883 * Port operations for DMA capable ALi without cable
27884 * detect
27885 */
27886-static struct ata_port_operations ali_20_port_ops = {
27887+static const struct ata_port_operations ali_20_port_ops = {
27888 .inherits = &ali_dma_base_ops,
27889 .cable_detect = ata_cable_40wire,
27890 .mode_filter = ali_20_filter,
27891@@ -393,7 +393,7 @@ static struct ata_port_operations ali_20_port_ops = {
27892 /*
27893 * Port operations for DMA capable ALi with cable detect
27894 */
27895-static struct ata_port_operations ali_c2_port_ops = {
27896+static const struct ata_port_operations ali_c2_port_ops = {
27897 .inherits = &ali_dma_base_ops,
27898 .check_atapi_dma = ali_check_atapi_dma,
27899 .cable_detect = ali_c2_cable_detect,
27900@@ -404,7 +404,7 @@ static struct ata_port_operations ali_c2_port_ops = {
27901 /*
27902 * Port operations for DMA capable ALi with cable detect
27903 */
27904-static struct ata_port_operations ali_c4_port_ops = {
27905+static const struct ata_port_operations ali_c4_port_ops = {
27906 .inherits = &ali_dma_base_ops,
27907 .check_atapi_dma = ali_check_atapi_dma,
27908 .cable_detect = ali_c2_cable_detect,
27909@@ -414,7 +414,7 @@ static struct ata_port_operations ali_c4_port_ops = {
27910 /*
27911 * Port operations for DMA capable ALi with cable detect and LBA48
27912 */
27913-static struct ata_port_operations ali_c5_port_ops = {
27914+static const struct ata_port_operations ali_c5_port_ops = {
27915 .inherits = &ali_dma_base_ops,
27916 .check_atapi_dma = ali_check_atapi_dma,
27917 .dev_config = ali_warn_atapi_dma,
27918diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
27919index 567f3f7..c8ee0da 100644
27920--- a/drivers/ata/pata_amd.c
27921+++ b/drivers/ata/pata_amd.c
27922@@ -397,28 +397,28 @@ static const struct ata_port_operations amd_base_port_ops = {
27923 .prereset = amd_pre_reset,
27924 };
27925
27926-static struct ata_port_operations amd33_port_ops = {
27927+static const struct ata_port_operations amd33_port_ops = {
27928 .inherits = &amd_base_port_ops,
27929 .cable_detect = ata_cable_40wire,
27930 .set_piomode = amd33_set_piomode,
27931 .set_dmamode = amd33_set_dmamode,
27932 };
27933
27934-static struct ata_port_operations amd66_port_ops = {
27935+static const struct ata_port_operations amd66_port_ops = {
27936 .inherits = &amd_base_port_ops,
27937 .cable_detect = ata_cable_unknown,
27938 .set_piomode = amd66_set_piomode,
27939 .set_dmamode = amd66_set_dmamode,
27940 };
27941
27942-static struct ata_port_operations amd100_port_ops = {
27943+static const struct ata_port_operations amd100_port_ops = {
27944 .inherits = &amd_base_port_ops,
27945 .cable_detect = ata_cable_unknown,
27946 .set_piomode = amd100_set_piomode,
27947 .set_dmamode = amd100_set_dmamode,
27948 };
27949
27950-static struct ata_port_operations amd133_port_ops = {
27951+static const struct ata_port_operations amd133_port_ops = {
27952 .inherits = &amd_base_port_ops,
27953 .cable_detect = amd_cable_detect,
27954 .set_piomode = amd133_set_piomode,
27955@@ -433,13 +433,13 @@ static const struct ata_port_operations nv_base_port_ops = {
27956 .host_stop = nv_host_stop,
27957 };
27958
27959-static struct ata_port_operations nv100_port_ops = {
27960+static const struct ata_port_operations nv100_port_ops = {
27961 .inherits = &nv_base_port_ops,
27962 .set_piomode = nv100_set_piomode,
27963 .set_dmamode = nv100_set_dmamode,
27964 };
27965
27966-static struct ata_port_operations nv133_port_ops = {
27967+static const struct ata_port_operations nv133_port_ops = {
27968 .inherits = &nv_base_port_ops,
27969 .set_piomode = nv133_set_piomode,
27970 .set_dmamode = nv133_set_dmamode,
27971diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
27972index d332cfd..4b7eaae 100644
27973--- a/drivers/ata/pata_artop.c
27974+++ b/drivers/ata/pata_artop.c
27975@@ -311,7 +311,7 @@ static struct scsi_host_template artop_sht = {
27976 ATA_BMDMA_SHT(DRV_NAME),
27977 };
27978
27979-static struct ata_port_operations artop6210_ops = {
27980+static const struct ata_port_operations artop6210_ops = {
27981 .inherits = &ata_bmdma_port_ops,
27982 .cable_detect = ata_cable_40wire,
27983 .set_piomode = artop6210_set_piomode,
27984@@ -320,7 +320,7 @@ static struct ata_port_operations artop6210_ops = {
27985 .qc_defer = artop6210_qc_defer,
27986 };
27987
27988-static struct ata_port_operations artop6260_ops = {
27989+static const struct ata_port_operations artop6260_ops = {
27990 .inherits = &ata_bmdma_port_ops,
27991 .cable_detect = artop6260_cable_detect,
27992 .set_piomode = artop6260_set_piomode,
27993diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
27994index 5c129f9..7bb7ccb 100644
27995--- a/drivers/ata/pata_at32.c
27996+++ b/drivers/ata/pata_at32.c
27997@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sht = {
27998 ATA_PIO_SHT(DRV_NAME),
27999 };
28000
28001-static struct ata_port_operations at32_port_ops = {
28002+static const struct ata_port_operations at32_port_ops = {
28003 .inherits = &ata_sff_port_ops,
28004 .cable_detect = ata_cable_40wire,
28005 .set_piomode = pata_at32_set_piomode,
28006diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
28007index 41c94b1..829006d 100644
28008--- a/drivers/ata/pata_at91.c
28009+++ b/drivers/ata/pata_at91.c
28010@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at91_sht = {
28011 ATA_PIO_SHT(DRV_NAME),
28012 };
28013
28014-static struct ata_port_operations pata_at91_port_ops = {
28015+static const struct ata_port_operations pata_at91_port_ops = {
28016 .inherits = &ata_sff_port_ops,
28017
28018 .sff_data_xfer = pata_at91_data_xfer_noirq,
28019diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
28020index ae4454d..d391eb4 100644
28021--- a/drivers/ata/pata_atiixp.c
28022+++ b/drivers/ata/pata_atiixp.c
28023@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_sht = {
28024 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
28025 };
28026
28027-static struct ata_port_operations atiixp_port_ops = {
28028+static const struct ata_port_operations atiixp_port_ops = {
28029 .inherits = &ata_bmdma_port_ops,
28030
28031 .qc_prep = ata_sff_dumb_qc_prep,
28032diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c
28033index 6fe7ded..2a425dc 100644
28034--- a/drivers/ata/pata_atp867x.c
28035+++ b/drivers/ata/pata_atp867x.c
28036@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x_sht = {
28037 ATA_BMDMA_SHT(DRV_NAME),
28038 };
28039
28040-static struct ata_port_operations atp867x_ops = {
28041+static const struct ata_port_operations atp867x_ops = {
28042 .inherits = &ata_bmdma_port_ops,
28043 .cable_detect = atp867x_cable_detect,
28044 .set_piomode = atp867x_set_piomode,
28045diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
28046index c4b47a3..b27a367 100644
28047--- a/drivers/ata/pata_bf54x.c
28048+++ b/drivers/ata/pata_bf54x.c
28049@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sht = {
28050 .dma_boundary = ATA_DMA_BOUNDARY,
28051 };
28052
28053-static struct ata_port_operations bfin_pata_ops = {
28054+static const struct ata_port_operations bfin_pata_ops = {
28055 .inherits = &ata_sff_port_ops,
28056
28057 .set_piomode = bfin_set_piomode,
28058diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
28059index 5acf9fa..84248be 100644
28060--- a/drivers/ata/pata_cmd640.c
28061+++ b/drivers/ata/pata_cmd640.c
28062@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_sht = {
28063 ATA_BMDMA_SHT(DRV_NAME),
28064 };
28065
28066-static struct ata_port_operations cmd640_port_ops = {
28067+static const struct ata_port_operations cmd640_port_ops = {
28068 .inherits = &ata_bmdma_port_ops,
28069 /* In theory xfer_noirq is not needed once we kill the prefetcher */
28070 .sff_data_xfer = ata_sff_data_xfer_noirq,
28071diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
28072index ccd2694..c869c3d 100644
28073--- a/drivers/ata/pata_cmd64x.c
28074+++ b/drivers/ata/pata_cmd64x.c
28075@@ -271,18 +271,18 @@ static const struct ata_port_operations cmd64x_base_ops = {
28076 .set_dmamode = cmd64x_set_dmamode,
28077 };
28078
28079-static struct ata_port_operations cmd64x_port_ops = {
28080+static const struct ata_port_operations cmd64x_port_ops = {
28081 .inherits = &cmd64x_base_ops,
28082 .cable_detect = ata_cable_40wire,
28083 };
28084
28085-static struct ata_port_operations cmd646r1_port_ops = {
28086+static const struct ata_port_operations cmd646r1_port_ops = {
28087 .inherits = &cmd64x_base_ops,
28088 .bmdma_stop = cmd646r1_bmdma_stop,
28089 .cable_detect = ata_cable_40wire,
28090 };
28091
28092-static struct ata_port_operations cmd648_port_ops = {
28093+static const struct ata_port_operations cmd648_port_ops = {
28094 .inherits = &cmd64x_base_ops,
28095 .bmdma_stop = cmd648_bmdma_stop,
28096 .cable_detect = cmd648_cable_detect,
28097diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
28098index 0df83cf..d7595b0 100644
28099--- a/drivers/ata/pata_cs5520.c
28100+++ b/drivers/ata/pata_cs5520.c
28101@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_sht = {
28102 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
28103 };
28104
28105-static struct ata_port_operations cs5520_port_ops = {
28106+static const struct ata_port_operations cs5520_port_ops = {
28107 .inherits = &ata_bmdma_port_ops,
28108 .qc_prep = ata_sff_dumb_qc_prep,
28109 .cable_detect = ata_cable_40wire,
28110diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
28111index c974b05..6d26b11 100644
28112--- a/drivers/ata/pata_cs5530.c
28113+++ b/drivers/ata/pata_cs5530.c
28114@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_sht = {
28115 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
28116 };
28117
28118-static struct ata_port_operations cs5530_port_ops = {
28119+static const struct ata_port_operations cs5530_port_ops = {
28120 .inherits = &ata_bmdma_port_ops,
28121
28122 .qc_prep = ata_sff_dumb_qc_prep,
28123diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
28124index 403f561..aacd26b 100644
28125--- a/drivers/ata/pata_cs5535.c
28126+++ b/drivers/ata/pata_cs5535.c
28127@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_sht = {
28128 ATA_BMDMA_SHT(DRV_NAME),
28129 };
28130
28131-static struct ata_port_operations cs5535_port_ops = {
28132+static const struct ata_port_operations cs5535_port_ops = {
28133 .inherits = &ata_bmdma_port_ops,
28134 .cable_detect = cs5535_cable_detect,
28135 .set_piomode = cs5535_set_piomode,
28136diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
28137index 6da4cb4..de24a25 100644
28138--- a/drivers/ata/pata_cs5536.c
28139+++ b/drivers/ata/pata_cs5536.c
28140@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_sht = {
28141 ATA_BMDMA_SHT(DRV_NAME),
28142 };
28143
28144-static struct ata_port_operations cs5536_port_ops = {
28145+static const struct ata_port_operations cs5536_port_ops = {
28146 .inherits = &ata_bmdma_port_ops,
28147 .cable_detect = cs5536_cable_detect,
28148 .set_piomode = cs5536_set_piomode,
28149diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
28150index 8fb040b..b16a9c9 100644
28151--- a/drivers/ata/pata_cypress.c
28152+++ b/drivers/ata/pata_cypress.c
28153@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c693_sht = {
28154 ATA_BMDMA_SHT(DRV_NAME),
28155 };
28156
28157-static struct ata_port_operations cy82c693_port_ops = {
28158+static const struct ata_port_operations cy82c693_port_ops = {
28159 .inherits = &ata_bmdma_port_ops,
28160 .cable_detect = ata_cable_40wire,
28161 .set_piomode = cy82c693_set_piomode,
28162diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
28163index 2a6412f..555ee11 100644
28164--- a/drivers/ata/pata_efar.c
28165+++ b/drivers/ata/pata_efar.c
28166@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sht = {
28167 ATA_BMDMA_SHT(DRV_NAME),
28168 };
28169
28170-static struct ata_port_operations efar_ops = {
28171+static const struct ata_port_operations efar_ops = {
28172 .inherits = &ata_bmdma_port_ops,
28173 .cable_detect = efar_cable_detect,
28174 .set_piomode = efar_set_piomode,
28175diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
28176index b9d8836..0b92030 100644
28177--- a/drivers/ata/pata_hpt366.c
28178+++ b/drivers/ata/pata_hpt366.c
28179@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_sht = {
28180 * Configuration for HPT366/68
28181 */
28182
28183-static struct ata_port_operations hpt366_port_ops = {
28184+static const struct ata_port_operations hpt366_port_ops = {
28185 .inherits = &ata_bmdma_port_ops,
28186 .cable_detect = hpt36x_cable_detect,
28187 .mode_filter = hpt366_filter,
28188diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
28189index 5af7f19..00c4980 100644
28190--- a/drivers/ata/pata_hpt37x.c
28191+++ b/drivers/ata/pata_hpt37x.c
28192@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_sht = {
28193 * Configuration for HPT370
28194 */
28195
28196-static struct ata_port_operations hpt370_port_ops = {
28197+static const struct ata_port_operations hpt370_port_ops = {
28198 .inherits = &ata_bmdma_port_ops,
28199
28200 .bmdma_stop = hpt370_bmdma_stop,
28201@@ -591,7 +591,7 @@ static struct ata_port_operations hpt370_port_ops = {
28202 * Configuration for HPT370A. Close to 370 but less filters
28203 */
28204
28205-static struct ata_port_operations hpt370a_port_ops = {
28206+static const struct ata_port_operations hpt370a_port_ops = {
28207 .inherits = &hpt370_port_ops,
28208 .mode_filter = hpt370a_filter,
28209 };
28210@@ -601,7 +601,7 @@ static struct ata_port_operations hpt370a_port_ops = {
28211 * and DMA mode setting functionality.
28212 */
28213
28214-static struct ata_port_operations hpt372_port_ops = {
28215+static const struct ata_port_operations hpt372_port_ops = {
28216 .inherits = &ata_bmdma_port_ops,
28217
28218 .bmdma_stop = hpt37x_bmdma_stop,
28219@@ -616,7 +616,7 @@ static struct ata_port_operations hpt372_port_ops = {
28220 * but we have a different cable detection procedure for function 1.
28221 */
28222
28223-static struct ata_port_operations hpt374_fn1_port_ops = {
28224+static const struct ata_port_operations hpt374_fn1_port_ops = {
28225 .inherits = &hpt372_port_ops,
28226 .prereset = hpt374_fn1_pre_reset,
28227 };
28228diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
28229index 100f227..2e39382 100644
28230--- a/drivers/ata/pata_hpt3x2n.c
28231+++ b/drivers/ata/pata_hpt3x2n.c
28232@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n_sht = {
28233 * Configuration for HPT3x2n.
28234 */
28235
28236-static struct ata_port_operations hpt3x2n_port_ops = {
28237+static const struct ata_port_operations hpt3x2n_port_ops = {
28238 .inherits = &ata_bmdma_port_ops,
28239
28240 .bmdma_stop = hpt3x2n_bmdma_stop,
28241diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
28242index 7e31025..6fca8f4 100644
28243--- a/drivers/ata/pata_hpt3x3.c
28244+++ b/drivers/ata/pata_hpt3x3.c
28245@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_sht = {
28246 ATA_BMDMA_SHT(DRV_NAME),
28247 };
28248
28249-static struct ata_port_operations hpt3x3_port_ops = {
28250+static const struct ata_port_operations hpt3x3_port_ops = {
28251 .inherits = &ata_bmdma_port_ops,
28252 .cable_detect = ata_cable_40wire,
28253 .set_piomode = hpt3x3_set_piomode,
28254diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
28255index b663b7f..9a26c2a 100644
28256--- a/drivers/ata/pata_icside.c
28257+++ b/drivers/ata/pata_icside.c
28258@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct ata_link *link, unsigned int *classes)
28259 }
28260 }
28261
28262-static struct ata_port_operations pata_icside_port_ops = {
28263+static const struct ata_port_operations pata_icside_port_ops = {
28264 .inherits = &ata_sff_port_ops,
28265 /* no need to build any PRD tables for DMA */
28266 .qc_prep = ata_noop_qc_prep,
28267diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
28268index 4bceb88..457dfb6 100644
28269--- a/drivers/ata/pata_isapnp.c
28270+++ b/drivers/ata/pata_isapnp.c
28271@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_sht = {
28272 ATA_PIO_SHT(DRV_NAME),
28273 };
28274
28275-static struct ata_port_operations isapnp_port_ops = {
28276+static const struct ata_port_operations isapnp_port_ops = {
28277 .inherits = &ata_sff_port_ops,
28278 .cable_detect = ata_cable_40wire,
28279 };
28280
28281-static struct ata_port_operations isapnp_noalt_port_ops = {
28282+static const struct ata_port_operations isapnp_noalt_port_ops = {
28283 .inherits = &ata_sff_port_ops,
28284 .cable_detect = ata_cable_40wire,
28285 /* No altstatus so we don't want to use the lost interrupt poll */
28286diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
28287index f156da8..24976e2 100644
28288--- a/drivers/ata/pata_it8213.c
28289+++ b/drivers/ata/pata_it8213.c
28290@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_sht = {
28291 };
28292
28293
28294-static struct ata_port_operations it8213_ops = {
28295+static const struct ata_port_operations it8213_ops = {
28296 .inherits = &ata_bmdma_port_ops,
28297 .cable_detect = it8213_cable_detect,
28298 .set_piomode = it8213_set_piomode,
28299diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
28300index 188bc2f..ca9e785 100644
28301--- a/drivers/ata/pata_it821x.c
28302+++ b/drivers/ata/pata_it821x.c
28303@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_sht = {
28304 ATA_BMDMA_SHT(DRV_NAME),
28305 };
28306
28307-static struct ata_port_operations it821x_smart_port_ops = {
28308+static const struct ata_port_operations it821x_smart_port_ops = {
28309 .inherits = &ata_bmdma_port_ops,
28310
28311 .check_atapi_dma= it821x_check_atapi_dma,
28312@@ -814,7 +814,7 @@ static struct ata_port_operations it821x_smart_port_ops = {
28313 .port_start = it821x_port_start,
28314 };
28315
28316-static struct ata_port_operations it821x_passthru_port_ops = {
28317+static const struct ata_port_operations it821x_passthru_port_ops = {
28318 .inherits = &ata_bmdma_port_ops,
28319
28320 .check_atapi_dma= it821x_check_atapi_dma,
28321@@ -830,7 +830,7 @@ static struct ata_port_operations it821x_passthru_port_ops = {
28322 .port_start = it821x_port_start,
28323 };
28324
28325-static struct ata_port_operations it821x_rdc_port_ops = {
28326+static const struct ata_port_operations it821x_rdc_port_ops = {
28327 .inherits = &ata_bmdma_port_ops,
28328
28329 .check_atapi_dma= it821x_check_atapi_dma,
28330diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
28331index ba54b08..4b952b7 100644
28332--- a/drivers/ata/pata_ixp4xx_cf.c
28333+++ b/drivers/ata/pata_ixp4xx_cf.c
28334@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_sht = {
28335 ATA_PIO_SHT(DRV_NAME),
28336 };
28337
28338-static struct ata_port_operations ixp4xx_port_ops = {
28339+static const struct ata_port_operations ixp4xx_port_ops = {
28340 .inherits = &ata_sff_port_ops,
28341 .sff_data_xfer = ixp4xx_mmio_data_xfer,
28342 .cable_detect = ata_cable_40wire,
28343diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
28344index 3a1474a..434b0ff 100644
28345--- a/drivers/ata/pata_jmicron.c
28346+++ b/drivers/ata/pata_jmicron.c
28347@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron_sht = {
28348 ATA_BMDMA_SHT(DRV_NAME),
28349 };
28350
28351-static struct ata_port_operations jmicron_ops = {
28352+static const struct ata_port_operations jmicron_ops = {
28353 .inherits = &ata_bmdma_port_ops,
28354 .prereset = jmicron_pre_reset,
28355 };
28356diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
28357index 6932e56..220e71d 100644
28358--- a/drivers/ata/pata_legacy.c
28359+++ b/drivers/ata/pata_legacy.c
28360@@ -106,7 +106,7 @@ struct legacy_probe {
28361
28362 struct legacy_controller {
28363 const char *name;
28364- struct ata_port_operations *ops;
28365+ const struct ata_port_operations *ops;
28366 unsigned int pio_mask;
28367 unsigned int flags;
28368 unsigned int pflags;
28369@@ -223,12 +223,12 @@ static const struct ata_port_operations legacy_base_port_ops = {
28370 * pio_mask as well.
28371 */
28372
28373-static struct ata_port_operations simple_port_ops = {
28374+static const struct ata_port_operations simple_port_ops = {
28375 .inherits = &legacy_base_port_ops,
28376 .sff_data_xfer = ata_sff_data_xfer_noirq,
28377 };
28378
28379-static struct ata_port_operations legacy_port_ops = {
28380+static const struct ata_port_operations legacy_port_ops = {
28381 .inherits = &legacy_base_port_ops,
28382 .sff_data_xfer = ata_sff_data_xfer_noirq,
28383 .set_mode = legacy_set_mode,
28384@@ -324,7 +324,7 @@ static unsigned int pdc_data_xfer_vlb(struct ata_device *dev,
28385 return buflen;
28386 }
28387
28388-static struct ata_port_operations pdc20230_port_ops = {
28389+static const struct ata_port_operations pdc20230_port_ops = {
28390 .inherits = &legacy_base_port_ops,
28391 .set_piomode = pdc20230_set_piomode,
28392 .sff_data_xfer = pdc_data_xfer_vlb,
28393@@ -357,7 +357,7 @@ static void ht6560a_set_piomode(struct ata_port *ap, struct ata_device *adev)
28394 ioread8(ap->ioaddr.status_addr);
28395 }
28396
28397-static struct ata_port_operations ht6560a_port_ops = {
28398+static const struct ata_port_operations ht6560a_port_ops = {
28399 .inherits = &legacy_base_port_ops,
28400 .set_piomode = ht6560a_set_piomode,
28401 };
28402@@ -400,7 +400,7 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev)
28403 ioread8(ap->ioaddr.status_addr);
28404 }
28405
28406-static struct ata_port_operations ht6560b_port_ops = {
28407+static const struct ata_port_operations ht6560b_port_ops = {
28408 .inherits = &legacy_base_port_ops,
28409 .set_piomode = ht6560b_set_piomode,
28410 };
28411@@ -499,7 +499,7 @@ static void opti82c611a_set_piomode(struct ata_port *ap,
28412 }
28413
28414
28415-static struct ata_port_operations opti82c611a_port_ops = {
28416+static const struct ata_port_operations opti82c611a_port_ops = {
28417 .inherits = &legacy_base_port_ops,
28418 .set_piomode = opti82c611a_set_piomode,
28419 };
28420@@ -609,7 +609,7 @@ static unsigned int opti82c46x_qc_issue(struct ata_queued_cmd *qc)
28421 return ata_sff_qc_issue(qc);
28422 }
28423
28424-static struct ata_port_operations opti82c46x_port_ops = {
28425+static const struct ata_port_operations opti82c46x_port_ops = {
28426 .inherits = &legacy_base_port_ops,
28427 .set_piomode = opti82c46x_set_piomode,
28428 .qc_issue = opti82c46x_qc_issue,
28429@@ -771,20 +771,20 @@ static int qdi_port(struct platform_device *dev,
28430 return 0;
28431 }
28432
28433-static struct ata_port_operations qdi6500_port_ops = {
28434+static const struct ata_port_operations qdi6500_port_ops = {
28435 .inherits = &legacy_base_port_ops,
28436 .set_piomode = qdi6500_set_piomode,
28437 .qc_issue = qdi_qc_issue,
28438 .sff_data_xfer = vlb32_data_xfer,
28439 };
28440
28441-static struct ata_port_operations qdi6580_port_ops = {
28442+static const struct ata_port_operations qdi6580_port_ops = {
28443 .inherits = &legacy_base_port_ops,
28444 .set_piomode = qdi6580_set_piomode,
28445 .sff_data_xfer = vlb32_data_xfer,
28446 };
28447
28448-static struct ata_port_operations qdi6580dp_port_ops = {
28449+static const struct ata_port_operations qdi6580dp_port_ops = {
28450 .inherits = &legacy_base_port_ops,
28451 .set_piomode = qdi6580dp_set_piomode,
28452 .sff_data_xfer = vlb32_data_xfer,
28453@@ -855,7 +855,7 @@ static int winbond_port(struct platform_device *dev,
28454 return 0;
28455 }
28456
28457-static struct ata_port_operations winbond_port_ops = {
28458+static const struct ata_port_operations winbond_port_ops = {
28459 .inherits = &legacy_base_port_ops,
28460 .set_piomode = winbond_set_piomode,
28461 .sff_data_xfer = vlb32_data_xfer,
28462@@ -978,7 +978,7 @@ static __init int legacy_init_one(struct legacy_probe *probe)
28463 int pio_modes = controller->pio_mask;
28464 unsigned long io = probe->port;
28465 u32 mask = (1 << probe->slot);
28466- struct ata_port_operations *ops = controller->ops;
28467+ const struct ata_port_operations *ops = controller->ops;
28468 struct legacy_data *ld = &legacy_data[probe->slot];
28469 struct ata_host *host = NULL;
28470 struct ata_port *ap;
28471diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
28472index 2096fb7..4d090fc 100644
28473--- a/drivers/ata/pata_marvell.c
28474+++ b/drivers/ata/pata_marvell.c
28475@@ -100,7 +100,7 @@ static struct scsi_host_template marvell_sht = {
28476 ATA_BMDMA_SHT(DRV_NAME),
28477 };
28478
28479-static struct ata_port_operations marvell_ops = {
28480+static const struct ata_port_operations marvell_ops = {
28481 .inherits = &ata_bmdma_port_ops,
28482 .cable_detect = marvell_cable_detect,
28483 .prereset = marvell_pre_reset,
28484diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
28485index 99d41be..7d56aa8 100644
28486--- a/drivers/ata/pata_mpc52xx.c
28487+++ b/drivers/ata/pata_mpc52xx.c
28488@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx_ata_sht = {
28489 ATA_PIO_SHT(DRV_NAME),
28490 };
28491
28492-static struct ata_port_operations mpc52xx_ata_port_ops = {
28493+static const struct ata_port_operations mpc52xx_ata_port_ops = {
28494 .inherits = &ata_bmdma_port_ops,
28495 .sff_dev_select = mpc52xx_ata_dev_select,
28496 .set_piomode = mpc52xx_ata_set_piomode,
28497diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
28498index b21f002..0a27e7f 100644
28499--- a/drivers/ata/pata_mpiix.c
28500+++ b/drivers/ata/pata_mpiix.c
28501@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_sht = {
28502 ATA_PIO_SHT(DRV_NAME),
28503 };
28504
28505-static struct ata_port_operations mpiix_port_ops = {
28506+static const struct ata_port_operations mpiix_port_ops = {
28507 .inherits = &ata_sff_port_ops,
28508 .qc_issue = mpiix_qc_issue,
28509 .cable_detect = ata_cable_40wire,
28510diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
28511index f0d52f7..89c3be3 100644
28512--- a/drivers/ata/pata_netcell.c
28513+++ b/drivers/ata/pata_netcell.c
28514@@ -34,7 +34,7 @@ static struct scsi_host_template netcell_sht = {
28515 ATA_BMDMA_SHT(DRV_NAME),
28516 };
28517
28518-static struct ata_port_operations netcell_ops = {
28519+static const struct ata_port_operations netcell_ops = {
28520 .inherits = &ata_bmdma_port_ops,
28521 .cable_detect = ata_cable_80wire,
28522 .read_id = netcell_read_id,
28523diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
28524index dd53a66..a3f4317 100644
28525--- a/drivers/ata/pata_ninja32.c
28526+++ b/drivers/ata/pata_ninja32.c
28527@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32_sht = {
28528 ATA_BMDMA_SHT(DRV_NAME),
28529 };
28530
28531-static struct ata_port_operations ninja32_port_ops = {
28532+static const struct ata_port_operations ninja32_port_ops = {
28533 .inherits = &ata_bmdma_port_ops,
28534 .sff_dev_select = ninja32_dev_select,
28535 .cable_detect = ata_cable_40wire,
28536diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
28537index ca53fac..9aa93ef 100644
28538--- a/drivers/ata/pata_ns87410.c
28539+++ b/drivers/ata/pata_ns87410.c
28540@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410_sht = {
28541 ATA_PIO_SHT(DRV_NAME),
28542 };
28543
28544-static struct ata_port_operations ns87410_port_ops = {
28545+static const struct ata_port_operations ns87410_port_ops = {
28546 .inherits = &ata_sff_port_ops,
28547 .qc_issue = ns87410_qc_issue,
28548 .cable_detect = ata_cable_40wire,
28549diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
28550index 773b159..55f454e 100644
28551--- a/drivers/ata/pata_ns87415.c
28552+++ b/drivers/ata/pata_ns87415.c
28553@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct ata_port *ap)
28554 }
28555 #endif /* 87560 SuperIO Support */
28556
28557-static struct ata_port_operations ns87415_pata_ops = {
28558+static const struct ata_port_operations ns87415_pata_ops = {
28559 .inherits = &ata_bmdma_port_ops,
28560
28561 .check_atapi_dma = ns87415_check_atapi_dma,
28562@@ -313,7 +313,7 @@ static struct ata_port_operations ns87415_pata_ops = {
28563 };
28564
28565 #if defined(CONFIG_SUPERIO)
28566-static struct ata_port_operations ns87560_pata_ops = {
28567+static const struct ata_port_operations ns87560_pata_ops = {
28568 .inherits = &ns87415_pata_ops,
28569 .sff_tf_read = ns87560_tf_read,
28570 .sff_check_status = ns87560_check_status,
28571diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
28572index d6f6956..639295b 100644
28573--- a/drivers/ata/pata_octeon_cf.c
28574+++ b/drivers/ata/pata_octeon_cf.c
28575@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(struct ata_queued_cmd *qc)
28576 return 0;
28577 }
28578
28579+/* cannot be const */
28580 static struct ata_port_operations octeon_cf_ops = {
28581 .inherits = &ata_sff_port_ops,
28582 .check_atapi_dma = octeon_cf_check_atapi_dma,
28583diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
28584index 84ac503..adee1cd 100644
28585--- a/drivers/ata/pata_oldpiix.c
28586+++ b/drivers/ata/pata_oldpiix.c
28587@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix_sht = {
28588 ATA_BMDMA_SHT(DRV_NAME),
28589 };
28590
28591-static struct ata_port_operations oldpiix_pata_ops = {
28592+static const struct ata_port_operations oldpiix_pata_ops = {
28593 .inherits = &ata_bmdma_port_ops,
28594 .qc_issue = oldpiix_qc_issue,
28595 .cable_detect = ata_cable_40wire,
28596diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
28597index 99eddda..3a4c0aa 100644
28598--- a/drivers/ata/pata_opti.c
28599+++ b/drivers/ata/pata_opti.c
28600@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sht = {
28601 ATA_PIO_SHT(DRV_NAME),
28602 };
28603
28604-static struct ata_port_operations opti_port_ops = {
28605+static const struct ata_port_operations opti_port_ops = {
28606 .inherits = &ata_sff_port_ops,
28607 .cable_detect = ata_cable_40wire,
28608 .set_piomode = opti_set_piomode,
28609diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
28610index 86885a4..8e9968d 100644
28611--- a/drivers/ata/pata_optidma.c
28612+++ b/drivers/ata/pata_optidma.c
28613@@ -337,7 +337,7 @@ static struct scsi_host_template optidma_sht = {
28614 ATA_BMDMA_SHT(DRV_NAME),
28615 };
28616
28617-static struct ata_port_operations optidma_port_ops = {
28618+static const struct ata_port_operations optidma_port_ops = {
28619 .inherits = &ata_bmdma_port_ops,
28620 .cable_detect = ata_cable_40wire,
28621 .set_piomode = optidma_set_pio_mode,
28622@@ -346,7 +346,7 @@ static struct ata_port_operations optidma_port_ops = {
28623 .prereset = optidma_pre_reset,
28624 };
28625
28626-static struct ata_port_operations optiplus_port_ops = {
28627+static const struct ata_port_operations optiplus_port_ops = {
28628 .inherits = &optidma_port_ops,
28629 .set_piomode = optiplus_set_pio_mode,
28630 .set_dmamode = optiplus_set_dma_mode,
28631diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c
28632index 11fb4cc..1a14022 100644
28633--- a/drivers/ata/pata_palmld.c
28634+++ b/drivers/ata/pata_palmld.c
28635@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_sht = {
28636 ATA_PIO_SHT(DRV_NAME),
28637 };
28638
28639-static struct ata_port_operations palmld_port_ops = {
28640+static const struct ata_port_operations palmld_port_ops = {
28641 .inherits = &ata_sff_port_ops,
28642 .sff_data_xfer = ata_sff_data_xfer_noirq,
28643 .cable_detect = ata_cable_40wire,
28644diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
28645index dc99e26..7f4b1e4 100644
28646--- a/drivers/ata/pata_pcmcia.c
28647+++ b/drivers/ata/pata_pcmcia.c
28648@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_sht = {
28649 ATA_PIO_SHT(DRV_NAME),
28650 };
28651
28652-static struct ata_port_operations pcmcia_port_ops = {
28653+static const struct ata_port_operations pcmcia_port_ops = {
28654 .inherits = &ata_sff_port_ops,
28655 .sff_data_xfer = ata_sff_data_xfer_noirq,
28656 .cable_detect = ata_cable_40wire,
28657 .set_mode = pcmcia_set_mode,
28658 };
28659
28660-static struct ata_port_operations pcmcia_8bit_port_ops = {
28661+static const struct ata_port_operations pcmcia_8bit_port_ops = {
28662 .inherits = &ata_sff_port_ops,
28663 .sff_data_xfer = ata_data_xfer_8bit,
28664 .cable_detect = ata_cable_40wire,
28665@@ -256,7 +256,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
28666 unsigned long io_base, ctl_base;
28667 void __iomem *io_addr, *ctl_addr;
28668 int n_ports = 1;
28669- struct ata_port_operations *ops = &pcmcia_port_ops;
28670+ const struct ata_port_operations *ops = &pcmcia_port_ops;
28671
28672 info = kzalloc(sizeof(*info), GFP_KERNEL);
28673 if (info == NULL)
28674diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
28675index ca5cad0..3a1f125 100644
28676--- a/drivers/ata/pata_pdc2027x.c
28677+++ b/drivers/ata/pata_pdc2027x.c
28678@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027x_sht = {
28679 ATA_BMDMA_SHT(DRV_NAME),
28680 };
28681
28682-static struct ata_port_operations pdc2027x_pata100_ops = {
28683+static const struct ata_port_operations pdc2027x_pata100_ops = {
28684 .inherits = &ata_bmdma_port_ops,
28685 .check_atapi_dma = pdc2027x_check_atapi_dma,
28686 .cable_detect = pdc2027x_cable_detect,
28687 .prereset = pdc2027x_prereset,
28688 };
28689
28690-static struct ata_port_operations pdc2027x_pata133_ops = {
28691+static const struct ata_port_operations pdc2027x_pata133_ops = {
28692 .inherits = &pdc2027x_pata100_ops,
28693 .mode_filter = pdc2027x_mode_filter,
28694 .set_piomode = pdc2027x_set_piomode,
28695diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
28696index 2911120..4bf62aa 100644
28697--- a/drivers/ata/pata_pdc202xx_old.c
28698+++ b/drivers/ata/pata_pdc202xx_old.c
28699@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202xx_sht = {
28700 ATA_BMDMA_SHT(DRV_NAME),
28701 };
28702
28703-static struct ata_port_operations pdc2024x_port_ops = {
28704+static const struct ata_port_operations pdc2024x_port_ops = {
28705 .inherits = &ata_bmdma_port_ops,
28706
28707 .cable_detect = ata_cable_40wire,
28708@@ -284,7 +284,7 @@ static struct ata_port_operations pdc2024x_port_ops = {
28709 .sff_exec_command = pdc202xx_exec_command,
28710 };
28711
28712-static struct ata_port_operations pdc2026x_port_ops = {
28713+static const struct ata_port_operations pdc2026x_port_ops = {
28714 .inherits = &pdc2024x_port_ops,
28715
28716 .check_atapi_dma = pdc2026x_check_atapi_dma,
28717diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
28718index 3f6ebc6..a18c358 100644
28719--- a/drivers/ata/pata_platform.c
28720+++ b/drivers/ata/pata_platform.c
28721@@ -48,7 +48,7 @@ static struct scsi_host_template pata_platform_sht = {
28722 ATA_PIO_SHT(DRV_NAME),
28723 };
28724
28725-static struct ata_port_operations pata_platform_port_ops = {
28726+static const struct ata_port_operations pata_platform_port_ops = {
28727 .inherits = &ata_sff_port_ops,
28728 .sff_data_xfer = ata_sff_data_xfer_noirq,
28729 .cable_detect = ata_cable_unknown,
28730diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
28731index 45879dc..165a9f9 100644
28732--- a/drivers/ata/pata_qdi.c
28733+++ b/drivers/ata/pata_qdi.c
28734@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht = {
28735 ATA_PIO_SHT(DRV_NAME),
28736 };
28737
28738-static struct ata_port_operations qdi6500_port_ops = {
28739+static const struct ata_port_operations qdi6500_port_ops = {
28740 .inherits = &ata_sff_port_ops,
28741 .qc_issue = qdi_qc_issue,
28742 .sff_data_xfer = qdi_data_xfer,
28743@@ -165,7 +165,7 @@ static struct ata_port_operations qdi6500_port_ops = {
28744 .set_piomode = qdi6500_set_piomode,
28745 };
28746
28747-static struct ata_port_operations qdi6580_port_ops = {
28748+static const struct ata_port_operations qdi6580_port_ops = {
28749 .inherits = &qdi6500_port_ops,
28750 .set_piomode = qdi6580_set_piomode,
28751 };
28752diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
28753index 4401b33..716c5cc 100644
28754--- a/drivers/ata/pata_radisys.c
28755+++ b/drivers/ata/pata_radisys.c
28756@@ -187,7 +187,7 @@ static struct scsi_host_template radisys_sht = {
28757 ATA_BMDMA_SHT(DRV_NAME),
28758 };
28759
28760-static struct ata_port_operations radisys_pata_ops = {
28761+static const struct ata_port_operations radisys_pata_ops = {
28762 .inherits = &ata_bmdma_port_ops,
28763 .qc_issue = radisys_qc_issue,
28764 .cable_detect = ata_cable_unknown,
28765diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
28766index 45f1e10..fab6bca 100644
28767--- a/drivers/ata/pata_rb532_cf.c
28768+++ b/drivers/ata/pata_rb532_cf.c
28769@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handler(int irq, void *dev_instance)
28770 return IRQ_HANDLED;
28771 }
28772
28773-static struct ata_port_operations rb532_pata_port_ops = {
28774+static const struct ata_port_operations rb532_pata_port_ops = {
28775 .inherits = &ata_sff_port_ops,
28776 .sff_data_xfer = ata_sff_data_xfer32,
28777 };
28778diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c
28779index c843a1e..b5853c3 100644
28780--- a/drivers/ata/pata_rdc.c
28781+++ b/drivers/ata/pata_rdc.c
28782@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_port *ap, struct ata_device *adev)
28783 pci_write_config_byte(dev, 0x48, udma_enable);
28784 }
28785
28786-static struct ata_port_operations rdc_pata_ops = {
28787+static const struct ata_port_operations rdc_pata_ops = {
28788 .inherits = &ata_bmdma32_port_ops,
28789 .cable_detect = rdc_pata_cable_detect,
28790 .set_piomode = rdc_set_piomode,
28791diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
28792index a5e4dfe..080c8c9 100644
28793--- a/drivers/ata/pata_rz1000.c
28794+++ b/drivers/ata/pata_rz1000.c
28795@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_sht = {
28796 ATA_PIO_SHT(DRV_NAME),
28797 };
28798
28799-static struct ata_port_operations rz1000_port_ops = {
28800+static const struct ata_port_operations rz1000_port_ops = {
28801 .inherits = &ata_sff_port_ops,
28802 .cable_detect = ata_cable_40wire,
28803 .set_mode = rz1000_set_mode,
28804diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
28805index 3bbed83..e309daf 100644
28806--- a/drivers/ata/pata_sc1200.c
28807+++ b/drivers/ata/pata_sc1200.c
28808@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_sht = {
28809 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
28810 };
28811
28812-static struct ata_port_operations sc1200_port_ops = {
28813+static const struct ata_port_operations sc1200_port_ops = {
28814 .inherits = &ata_bmdma_port_ops,
28815 .qc_prep = ata_sff_dumb_qc_prep,
28816 .qc_issue = sc1200_qc_issue,
28817diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
28818index 4257d6b..4c1d9d5 100644
28819--- a/drivers/ata/pata_scc.c
28820+++ b/drivers/ata/pata_scc.c
28821@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht = {
28822 ATA_BMDMA_SHT(DRV_NAME),
28823 };
28824
28825-static struct ata_port_operations scc_pata_ops = {
28826+static const struct ata_port_operations scc_pata_ops = {
28827 .inherits = &ata_bmdma_port_ops,
28828
28829 .set_piomode = scc_set_piomode,
28830diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c
28831index 99cceb4..e2e0a87 100644
28832--- a/drivers/ata/pata_sch.c
28833+++ b/drivers/ata/pata_sch.c
28834@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht = {
28835 ATA_BMDMA_SHT(DRV_NAME),
28836 };
28837
28838-static struct ata_port_operations sch_pata_ops = {
28839+static const struct ata_port_operations sch_pata_ops = {
28840 .inherits = &ata_bmdma_port_ops,
28841 .cable_detect = ata_cable_unknown,
28842 .set_piomode = sch_set_piomode,
28843diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
28844index beaed12..39969f1 100644
28845--- a/drivers/ata/pata_serverworks.c
28846+++ b/drivers/ata/pata_serverworks.c
28847@@ -299,7 +299,7 @@ static struct scsi_host_template serverworks_sht = {
28848 ATA_BMDMA_SHT(DRV_NAME),
28849 };
28850
28851-static struct ata_port_operations serverworks_osb4_port_ops = {
28852+static const struct ata_port_operations serverworks_osb4_port_ops = {
28853 .inherits = &ata_bmdma_port_ops,
28854 .cable_detect = serverworks_cable_detect,
28855 .mode_filter = serverworks_osb4_filter,
28856@@ -307,7 +307,7 @@ static struct ata_port_operations serverworks_osb4_port_ops = {
28857 .set_dmamode = serverworks_set_dmamode,
28858 };
28859
28860-static struct ata_port_operations serverworks_csb_port_ops = {
28861+static const struct ata_port_operations serverworks_csb_port_ops = {
28862 .inherits = &serverworks_osb4_port_ops,
28863 .mode_filter = serverworks_csb_filter,
28864 };
28865diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
28866index a2ace48..0463b44 100644
28867--- a/drivers/ata/pata_sil680.c
28868+++ b/drivers/ata/pata_sil680.c
28869@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_sht = {
28870 ATA_BMDMA_SHT(DRV_NAME),
28871 };
28872
28873-static struct ata_port_operations sil680_port_ops = {
28874+static const struct ata_port_operations sil680_port_ops = {
28875 .inherits = &ata_bmdma32_port_ops,
28876 .cable_detect = sil680_cable_detect,
28877 .set_piomode = sil680_set_piomode,
28878diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
28879index 488e77b..b3724d5 100644
28880--- a/drivers/ata/pata_sis.c
28881+++ b/drivers/ata/pata_sis.c
28882@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht = {
28883 ATA_BMDMA_SHT(DRV_NAME),
28884 };
28885
28886-static struct ata_port_operations sis_133_for_sata_ops = {
28887+static const struct ata_port_operations sis_133_for_sata_ops = {
28888 .inherits = &ata_bmdma_port_ops,
28889 .set_piomode = sis_133_set_piomode,
28890 .set_dmamode = sis_133_set_dmamode,
28891 .cable_detect = sis_133_cable_detect,
28892 };
28893
28894-static struct ata_port_operations sis_base_ops = {
28895+static const struct ata_port_operations sis_base_ops = {
28896 .inherits = &ata_bmdma_port_ops,
28897 .prereset = sis_pre_reset,
28898 };
28899
28900-static struct ata_port_operations sis_133_ops = {
28901+static const struct ata_port_operations sis_133_ops = {
28902 .inherits = &sis_base_ops,
28903 .set_piomode = sis_133_set_piomode,
28904 .set_dmamode = sis_133_set_dmamode,
28905 .cable_detect = sis_133_cable_detect,
28906 };
28907
28908-static struct ata_port_operations sis_133_early_ops = {
28909+static const struct ata_port_operations sis_133_early_ops = {
28910 .inherits = &sis_base_ops,
28911 .set_piomode = sis_100_set_piomode,
28912 .set_dmamode = sis_133_early_set_dmamode,
28913 .cable_detect = sis_66_cable_detect,
28914 };
28915
28916-static struct ata_port_operations sis_100_ops = {
28917+static const struct ata_port_operations sis_100_ops = {
28918 .inherits = &sis_base_ops,
28919 .set_piomode = sis_100_set_piomode,
28920 .set_dmamode = sis_100_set_dmamode,
28921 .cable_detect = sis_66_cable_detect,
28922 };
28923
28924-static struct ata_port_operations sis_66_ops = {
28925+static const struct ata_port_operations sis_66_ops = {
28926 .inherits = &sis_base_ops,
28927 .set_piomode = sis_old_set_piomode,
28928 .set_dmamode = sis_66_set_dmamode,
28929 .cable_detect = sis_66_cable_detect,
28930 };
28931
28932-static struct ata_port_operations sis_old_ops = {
28933+static const struct ata_port_operations sis_old_ops = {
28934 .inherits = &sis_base_ops,
28935 .set_piomode = sis_old_set_piomode,
28936 .set_dmamode = sis_old_set_dmamode,
28937diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
28938index 29f733c..43e9ca0 100644
28939--- a/drivers/ata/pata_sl82c105.c
28940+++ b/drivers/ata/pata_sl82c105.c
28941@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c105_sht = {
28942 ATA_BMDMA_SHT(DRV_NAME),
28943 };
28944
28945-static struct ata_port_operations sl82c105_port_ops = {
28946+static const struct ata_port_operations sl82c105_port_ops = {
28947 .inherits = &ata_bmdma_port_ops,
28948 .qc_defer = sl82c105_qc_defer,
28949 .bmdma_start = sl82c105_bmdma_start,
28950diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
28951index f1f13ff..df39e99 100644
28952--- a/drivers/ata/pata_triflex.c
28953+++ b/drivers/ata/pata_triflex.c
28954@@ -178,7 +178,7 @@ static struct scsi_host_template triflex_sht = {
28955 ATA_BMDMA_SHT(DRV_NAME),
28956 };
28957
28958-static struct ata_port_operations triflex_port_ops = {
28959+static const struct ata_port_operations triflex_port_ops = {
28960 .inherits = &ata_bmdma_port_ops,
28961 .bmdma_start = triflex_bmdma_start,
28962 .bmdma_stop = triflex_bmdma_stop,
28963diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
28964index 1d73b8d..98a4b29 100644
28965--- a/drivers/ata/pata_via.c
28966+++ b/drivers/ata/pata_via.c
28967@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht = {
28968 ATA_BMDMA_SHT(DRV_NAME),
28969 };
28970
28971-static struct ata_port_operations via_port_ops = {
28972+static const struct ata_port_operations via_port_ops = {
28973 .inherits = &ata_bmdma_port_ops,
28974 .cable_detect = via_cable_detect,
28975 .set_piomode = via_set_piomode,
28976@@ -429,7 +429,7 @@ static struct ata_port_operations via_port_ops = {
28977 .port_start = via_port_start,
28978 };
28979
28980-static struct ata_port_operations via_port_ops_noirq = {
28981+static const struct ata_port_operations via_port_ops_noirq = {
28982 .inherits = &via_port_ops,
28983 .sff_data_xfer = ata_sff_data_xfer_noirq,
28984 };
28985diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
28986index 6d8619b..ad511c4 100644
28987--- a/drivers/ata/pata_winbond.c
28988+++ b/drivers/ata/pata_winbond.c
28989@@ -125,7 +125,7 @@ static struct scsi_host_template winbond_sht = {
28990 ATA_PIO_SHT(DRV_NAME),
28991 };
28992
28993-static struct ata_port_operations winbond_port_ops = {
28994+static const struct ata_port_operations winbond_port_ops = {
28995 .inherits = &ata_sff_port_ops,
28996 .sff_data_xfer = winbond_data_xfer,
28997 .cable_detect = ata_cable_40wire,
28998diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
28999index 6c65b07..f996ec7 100644
29000--- a/drivers/ata/pdc_adma.c
29001+++ b/drivers/ata/pdc_adma.c
29002@@ -145,7 +145,7 @@ static struct scsi_host_template adma_ata_sht = {
29003 .dma_boundary = ADMA_DMA_BOUNDARY,
29004 };
29005
29006-static struct ata_port_operations adma_ata_ops = {
29007+static const struct ata_port_operations adma_ata_ops = {
29008 .inherits = &ata_sff_port_ops,
29009
29010 .lost_interrupt = ATA_OP_NULL,
29011diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
29012index 172b57e..c49bc1e 100644
29013--- a/drivers/ata/sata_fsl.c
29014+++ b/drivers/ata/sata_fsl.c
29015@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fsl_sht = {
29016 .dma_boundary = ATA_DMA_BOUNDARY,
29017 };
29018
29019-static struct ata_port_operations sata_fsl_ops = {
29020+static const struct ata_port_operations sata_fsl_ops = {
29021 .inherits = &sata_pmp_port_ops,
29022
29023 .qc_defer = ata_std_qc_defer,
29024diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
29025index 4406902..60603ef 100644
29026--- a/drivers/ata/sata_inic162x.c
29027+++ b/drivers/ata/sata_inic162x.c
29028@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_port *ap)
29029 return 0;
29030 }
29031
29032-static struct ata_port_operations inic_port_ops = {
29033+static const struct ata_port_operations inic_port_ops = {
29034 .inherits = &sata_port_ops,
29035
29036 .check_atapi_dma = inic_check_atapi_dma,
29037diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
29038index cf41126..8107be6 100644
29039--- a/drivers/ata/sata_mv.c
29040+++ b/drivers/ata/sata_mv.c
29041@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht = {
29042 .dma_boundary = MV_DMA_BOUNDARY,
29043 };
29044
29045-static struct ata_port_operations mv5_ops = {
29046+static const struct ata_port_operations mv5_ops = {
29047 .inherits = &ata_sff_port_ops,
29048
29049 .lost_interrupt = ATA_OP_NULL,
29050@@ -678,7 +678,7 @@ static struct ata_port_operations mv5_ops = {
29051 .port_stop = mv_port_stop,
29052 };
29053
29054-static struct ata_port_operations mv6_ops = {
29055+static const struct ata_port_operations mv6_ops = {
29056 .inherits = &mv5_ops,
29057 .dev_config = mv6_dev_config,
29058 .scr_read = mv_scr_read,
29059@@ -698,7 +698,7 @@ static struct ata_port_operations mv6_ops = {
29060 .bmdma_status = mv_bmdma_status,
29061 };
29062
29063-static struct ata_port_operations mv_iie_ops = {
29064+static const struct ata_port_operations mv_iie_ops = {
29065 .inherits = &mv6_ops,
29066 .dev_config = ATA_OP_NULL,
29067 .qc_prep = mv_qc_prep_iie,
29068diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
29069index ae2297c..d5c9c33 100644
29070--- a/drivers/ata/sata_nv.c
29071+++ b/drivers/ata/sata_nv.c
29072@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swncq_sht = {
29073 * cases. Define nv_hardreset() which only kicks in for post-boot
29074 * probing and use it for all variants.
29075 */
29076-static struct ata_port_operations nv_generic_ops = {
29077+static const struct ata_port_operations nv_generic_ops = {
29078 .inherits = &ata_bmdma_port_ops,
29079 .lost_interrupt = ATA_OP_NULL,
29080 .scr_read = nv_scr_read,
29081@@ -472,20 +472,20 @@ static struct ata_port_operations nv_generic_ops = {
29082 .hardreset = nv_hardreset,
29083 };
29084
29085-static struct ata_port_operations nv_nf2_ops = {
29086+static const struct ata_port_operations nv_nf2_ops = {
29087 .inherits = &nv_generic_ops,
29088 .freeze = nv_nf2_freeze,
29089 .thaw = nv_nf2_thaw,
29090 };
29091
29092-static struct ata_port_operations nv_ck804_ops = {
29093+static const struct ata_port_operations nv_ck804_ops = {
29094 .inherits = &nv_generic_ops,
29095 .freeze = nv_ck804_freeze,
29096 .thaw = nv_ck804_thaw,
29097 .host_stop = nv_ck804_host_stop,
29098 };
29099
29100-static struct ata_port_operations nv_adma_ops = {
29101+static const struct ata_port_operations nv_adma_ops = {
29102 .inherits = &nv_ck804_ops,
29103
29104 .check_atapi_dma = nv_adma_check_atapi_dma,
29105@@ -509,7 +509,7 @@ static struct ata_port_operations nv_adma_ops = {
29106 .host_stop = nv_adma_host_stop,
29107 };
29108
29109-static struct ata_port_operations nv_swncq_ops = {
29110+static const struct ata_port_operations nv_swncq_ops = {
29111 .inherits = &nv_generic_ops,
29112
29113 .qc_defer = ata_std_qc_defer,
29114diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
29115index 07d8d00..6cc70bb 100644
29116--- a/drivers/ata/sata_promise.c
29117+++ b/drivers/ata/sata_promise.c
29118@@ -195,7 +195,7 @@ static const struct ata_port_operations pdc_common_ops = {
29119 .error_handler = pdc_error_handler,
29120 };
29121
29122-static struct ata_port_operations pdc_sata_ops = {
29123+static const struct ata_port_operations pdc_sata_ops = {
29124 .inherits = &pdc_common_ops,
29125 .cable_detect = pdc_sata_cable_detect,
29126 .freeze = pdc_sata_freeze,
29127@@ -208,14 +208,14 @@ static struct ata_port_operations pdc_sata_ops = {
29128
29129 /* First-generation chips need a more restrictive ->check_atapi_dma op,
29130 and ->freeze/thaw that ignore the hotplug controls. */
29131-static struct ata_port_operations pdc_old_sata_ops = {
29132+static const struct ata_port_operations pdc_old_sata_ops = {
29133 .inherits = &pdc_sata_ops,
29134 .freeze = pdc_freeze,
29135 .thaw = pdc_thaw,
29136 .check_atapi_dma = pdc_old_sata_check_atapi_dma,
29137 };
29138
29139-static struct ata_port_operations pdc_pata_ops = {
29140+static const struct ata_port_operations pdc_pata_ops = {
29141 .inherits = &pdc_common_ops,
29142 .cable_detect = pdc_pata_cable_detect,
29143 .freeze = pdc_freeze,
29144diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
29145index 326c0cf..36ecebe 100644
29146--- a/drivers/ata/sata_qstor.c
29147+++ b/drivers/ata/sata_qstor.c
29148@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_sht = {
29149 .dma_boundary = QS_DMA_BOUNDARY,
29150 };
29151
29152-static struct ata_port_operations qs_ata_ops = {
29153+static const struct ata_port_operations qs_ata_ops = {
29154 .inherits = &ata_sff_port_ops,
29155
29156 .check_atapi_dma = qs_check_atapi_dma,
29157diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
29158index 3cb69d5..0871d3c 100644
29159--- a/drivers/ata/sata_sil.c
29160+++ b/drivers/ata/sata_sil.c
29161@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht = {
29162 .sg_tablesize = ATA_MAX_PRD
29163 };
29164
29165-static struct ata_port_operations sil_ops = {
29166+static const struct ata_port_operations sil_ops = {
29167 .inherits = &ata_bmdma32_port_ops,
29168 .dev_config = sil_dev_config,
29169 .set_mode = sil_set_mode,
29170diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
29171index e6946fc..eddb794 100644
29172--- a/drivers/ata/sata_sil24.c
29173+++ b/drivers/ata/sata_sil24.c
29174@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_sht = {
29175 .dma_boundary = ATA_DMA_BOUNDARY,
29176 };
29177
29178-static struct ata_port_operations sil24_ops = {
29179+static const struct ata_port_operations sil24_ops = {
29180 .inherits = &sata_pmp_port_ops,
29181
29182 .qc_defer = sil24_qc_defer,
29183diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
29184index f8a91bf..9cb06b6 100644
29185--- a/drivers/ata/sata_sis.c
29186+++ b/drivers/ata/sata_sis.c
29187@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht = {
29188 ATA_BMDMA_SHT(DRV_NAME),
29189 };
29190
29191-static struct ata_port_operations sis_ops = {
29192+static const struct ata_port_operations sis_ops = {
29193 .inherits = &ata_bmdma_port_ops,
29194 .scr_read = sis_scr_read,
29195 .scr_write = sis_scr_write,
29196diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
29197index 7257f2d..d04c6f5 100644
29198--- a/drivers/ata/sata_svw.c
29199+++ b/drivers/ata/sata_svw.c
29200@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata_sht = {
29201 };
29202
29203
29204-static struct ata_port_operations k2_sata_ops = {
29205+static const struct ata_port_operations k2_sata_ops = {
29206 .inherits = &ata_bmdma_port_ops,
29207 .sff_tf_load = k2_sata_tf_load,
29208 .sff_tf_read = k2_sata_tf_read,
29209diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
29210index bbcf970..cd0df0d 100644
29211--- a/drivers/ata/sata_sx4.c
29212+++ b/drivers/ata/sata_sx4.c
29213@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sata_sht = {
29214 };
29215
29216 /* TODO: inherit from base port_ops after converting to new EH */
29217-static struct ata_port_operations pdc_20621_ops = {
29218+static const struct ata_port_operations pdc_20621_ops = {
29219 .inherits = &ata_sff_port_ops,
29220
29221 .check_atapi_dma = pdc_check_atapi_dma,
29222diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
29223index e5bff47..089d859 100644
29224--- a/drivers/ata/sata_uli.c
29225+++ b/drivers/ata/sata_uli.c
29226@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht = {
29227 ATA_BMDMA_SHT(DRV_NAME),
29228 };
29229
29230-static struct ata_port_operations uli_ops = {
29231+static const struct ata_port_operations uli_ops = {
29232 .inherits = &ata_bmdma_port_ops,
29233 .scr_read = uli_scr_read,
29234 .scr_write = uli_scr_write,
29235diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
29236index f5dcca7..77b94eb 100644
29237--- a/drivers/ata/sata_via.c
29238+++ b/drivers/ata/sata_via.c
29239@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sht = {
29240 ATA_BMDMA_SHT(DRV_NAME),
29241 };
29242
29243-static struct ata_port_operations svia_base_ops = {
29244+static const struct ata_port_operations svia_base_ops = {
29245 .inherits = &ata_bmdma_port_ops,
29246 .sff_tf_load = svia_tf_load,
29247 };
29248
29249-static struct ata_port_operations vt6420_sata_ops = {
29250+static const struct ata_port_operations vt6420_sata_ops = {
29251 .inherits = &svia_base_ops,
29252 .freeze = svia_noop_freeze,
29253 .prereset = vt6420_prereset,
29254 .bmdma_start = vt6420_bmdma_start,
29255 };
29256
29257-static struct ata_port_operations vt6421_pata_ops = {
29258+static const struct ata_port_operations vt6421_pata_ops = {
29259 .inherits = &svia_base_ops,
29260 .cable_detect = vt6421_pata_cable_detect,
29261 .set_piomode = vt6421_set_pio_mode,
29262 .set_dmamode = vt6421_set_dma_mode,
29263 };
29264
29265-static struct ata_port_operations vt6421_sata_ops = {
29266+static const struct ata_port_operations vt6421_sata_ops = {
29267 .inherits = &svia_base_ops,
29268 .scr_read = svia_scr_read,
29269 .scr_write = svia_scr_write,
29270 };
29271
29272-static struct ata_port_operations vt8251_ops = {
29273+static const struct ata_port_operations vt8251_ops = {
29274 .inherits = &svia_base_ops,
29275 .hardreset = sata_std_hardreset,
29276 .scr_read = vt8251_scr_read,
29277diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
29278index 8b2a278..51e65d3 100644
29279--- a/drivers/ata/sata_vsc.c
29280+++ b/drivers/ata/sata_vsc.c
29281@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sata_sht = {
29282 };
29283
29284
29285-static struct ata_port_operations vsc_sata_ops = {
29286+static const struct ata_port_operations vsc_sata_ops = {
29287 .inherits = &ata_bmdma_port_ops,
29288 /* The IRQ handling is not quite standard SFF behaviour so we
29289 cannot use the default lost interrupt handler */
29290diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
29291index 5effec6..7e4019a 100644
29292--- a/drivers/atm/adummy.c
29293+++ b/drivers/atm/adummy.c
29294@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
29295 vcc->pop(vcc, skb);
29296 else
29297 dev_kfree_skb_any(skb);
29298- atomic_inc(&vcc->stats->tx);
29299+ atomic_inc_unchecked(&vcc->stats->tx);
29300
29301 return 0;
29302 }
29303diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
29304index 66e1813..26a27c6 100644
29305--- a/drivers/atm/ambassador.c
29306+++ b/drivers/atm/ambassador.c
29307@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
29308 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
29309
29310 // VC layer stats
29311- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
29312+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
29313
29314 // free the descriptor
29315 kfree (tx_descr);
29316@@ -494,7 +494,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
29317 dump_skb ("<<<", vc, skb);
29318
29319 // VC layer stats
29320- atomic_inc(&atm_vcc->stats->rx);
29321+ atomic_inc_unchecked(&atm_vcc->stats->rx);
29322 __net_timestamp(skb);
29323 // end of our responsability
29324 atm_vcc->push (atm_vcc, skb);
29325@@ -509,7 +509,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
29326 } else {
29327 PRINTK (KERN_INFO, "dropped over-size frame");
29328 // should we count this?
29329- atomic_inc(&atm_vcc->stats->rx_drop);
29330+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
29331 }
29332
29333 } else {
29334@@ -1341,7 +1341,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
29335 }
29336
29337 if (check_area (skb->data, skb->len)) {
29338- atomic_inc(&atm_vcc->stats->tx_err);
29339+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
29340 return -ENOMEM; // ?
29341 }
29342
29343diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
29344index 02ad83d..6daffeb 100644
29345--- a/drivers/atm/atmtcp.c
29346+++ b/drivers/atm/atmtcp.c
29347@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
29348 if (vcc->pop) vcc->pop(vcc,skb);
29349 else dev_kfree_skb(skb);
29350 if (dev_data) return 0;
29351- atomic_inc(&vcc->stats->tx_err);
29352+ atomic_inc_unchecked(&vcc->stats->tx_err);
29353 return -ENOLINK;
29354 }
29355 size = skb->len+sizeof(struct atmtcp_hdr);
29356@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
29357 if (!new_skb) {
29358 if (vcc->pop) vcc->pop(vcc,skb);
29359 else dev_kfree_skb(skb);
29360- atomic_inc(&vcc->stats->tx_err);
29361+ atomic_inc_unchecked(&vcc->stats->tx_err);
29362 return -ENOBUFS;
29363 }
29364 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
29365@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
29366 if (vcc->pop) vcc->pop(vcc,skb);
29367 else dev_kfree_skb(skb);
29368 out_vcc->push(out_vcc,new_skb);
29369- atomic_inc(&vcc->stats->tx);
29370- atomic_inc(&out_vcc->stats->rx);
29371+ atomic_inc_unchecked(&vcc->stats->tx);
29372+ atomic_inc_unchecked(&out_vcc->stats->rx);
29373 return 0;
29374 }
29375
29376@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
29377 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
29378 read_unlock(&vcc_sklist_lock);
29379 if (!out_vcc) {
29380- atomic_inc(&vcc->stats->tx_err);
29381+ atomic_inc_unchecked(&vcc->stats->tx_err);
29382 goto done;
29383 }
29384 skb_pull(skb,sizeof(struct atmtcp_hdr));
29385@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
29386 __net_timestamp(new_skb);
29387 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
29388 out_vcc->push(out_vcc,new_skb);
29389- atomic_inc(&vcc->stats->tx);
29390- atomic_inc(&out_vcc->stats->rx);
29391+ atomic_inc_unchecked(&vcc->stats->tx);
29392+ atomic_inc_unchecked(&out_vcc->stats->rx);
29393 done:
29394 if (vcc->pop) vcc->pop(vcc,skb);
29395 else dev_kfree_skb(skb);
29396diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
29397index 0c30261..3da356e 100644
29398--- a/drivers/atm/eni.c
29399+++ b/drivers/atm/eni.c
29400@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
29401 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
29402 vcc->dev->number);
29403 length = 0;
29404- atomic_inc(&vcc->stats->rx_err);
29405+ atomic_inc_unchecked(&vcc->stats->rx_err);
29406 }
29407 else {
29408 length = ATM_CELL_SIZE-1; /* no HEC */
29409@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
29410 size);
29411 }
29412 eff = length = 0;
29413- atomic_inc(&vcc->stats->rx_err);
29414+ atomic_inc_unchecked(&vcc->stats->rx_err);
29415 }
29416 else {
29417 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
29418@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
29419 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
29420 vcc->dev->number,vcc->vci,length,size << 2,descr);
29421 length = eff = 0;
29422- atomic_inc(&vcc->stats->rx_err);
29423+ atomic_inc_unchecked(&vcc->stats->rx_err);
29424 }
29425 }
29426 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
29427@@ -770,7 +770,7 @@ rx_dequeued++;
29428 vcc->push(vcc,skb);
29429 pushed++;
29430 }
29431- atomic_inc(&vcc->stats->rx);
29432+ atomic_inc_unchecked(&vcc->stats->rx);
29433 }
29434 wake_up(&eni_dev->rx_wait);
29435 }
29436@@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
29437 PCI_DMA_TODEVICE);
29438 if (vcc->pop) vcc->pop(vcc,skb);
29439 else dev_kfree_skb_irq(skb);
29440- atomic_inc(&vcc->stats->tx);
29441+ atomic_inc_unchecked(&vcc->stats->tx);
29442 wake_up(&eni_dev->tx_wait);
29443 dma_complete++;
29444 }
29445@@ -1570,7 +1570,7 @@ tx_complete++;
29446 /*--------------------------------- entries ---------------------------------*/
29447
29448
29449-static const char *media_name[] __devinitdata = {
29450+static const char *media_name[] __devinitconst = {
29451 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
29452 "UTP", "05?", "06?", "07?", /* 4- 7 */
29453 "TAXI","09?", "10?", "11?", /* 8-11 */
29454diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
29455index cd5049a..a51209f 100644
29456--- a/drivers/atm/firestream.c
29457+++ b/drivers/atm/firestream.c
29458@@ -748,7 +748,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
29459 }
29460 }
29461
29462- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
29463+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
29464
29465 fs_dprintk (FS_DEBUG_TXMEM, "i");
29466 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
29467@@ -815,7 +815,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
29468 #endif
29469 skb_put (skb, qe->p1 & 0xffff);
29470 ATM_SKB(skb)->vcc = atm_vcc;
29471- atomic_inc(&atm_vcc->stats->rx);
29472+ atomic_inc_unchecked(&atm_vcc->stats->rx);
29473 __net_timestamp(skb);
29474 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
29475 atm_vcc->push (atm_vcc, skb);
29476@@ -836,12 +836,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
29477 kfree (pe);
29478 }
29479 if (atm_vcc)
29480- atomic_inc(&atm_vcc->stats->rx_drop);
29481+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
29482 break;
29483 case 0x1f: /* Reassembly abort: no buffers. */
29484 /* Silently increment error counter. */
29485 if (atm_vcc)
29486- atomic_inc(&atm_vcc->stats->rx_drop);
29487+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
29488 break;
29489 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
29490 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
29491diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
29492index f766cc4..a34002e 100644
29493--- a/drivers/atm/fore200e.c
29494+++ b/drivers/atm/fore200e.c
29495@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
29496 #endif
29497 /* check error condition */
29498 if (*entry->status & STATUS_ERROR)
29499- atomic_inc(&vcc->stats->tx_err);
29500+ atomic_inc_unchecked(&vcc->stats->tx_err);
29501 else
29502- atomic_inc(&vcc->stats->tx);
29503+ atomic_inc_unchecked(&vcc->stats->tx);
29504 }
29505 }
29506
29507@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
29508 if (skb == NULL) {
29509 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
29510
29511- atomic_inc(&vcc->stats->rx_drop);
29512+ atomic_inc_unchecked(&vcc->stats->rx_drop);
29513 return -ENOMEM;
29514 }
29515
29516@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
29517
29518 dev_kfree_skb_any(skb);
29519
29520- atomic_inc(&vcc->stats->rx_drop);
29521+ atomic_inc_unchecked(&vcc->stats->rx_drop);
29522 return -ENOMEM;
29523 }
29524
29525 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
29526
29527 vcc->push(vcc, skb);
29528- atomic_inc(&vcc->stats->rx);
29529+ atomic_inc_unchecked(&vcc->stats->rx);
29530
29531 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
29532
29533@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
29534 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
29535 fore200e->atm_dev->number,
29536 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
29537- atomic_inc(&vcc->stats->rx_err);
29538+ atomic_inc_unchecked(&vcc->stats->rx_err);
29539 }
29540 }
29541
29542@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
29543 goto retry_here;
29544 }
29545
29546- atomic_inc(&vcc->stats->tx_err);
29547+ atomic_inc_unchecked(&vcc->stats->tx_err);
29548
29549 fore200e->tx_sat++;
29550 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
29551diff --git a/drivers/atm/he.c b/drivers/atm/he.c
29552index 7066703..2b130de 100644
29553--- a/drivers/atm/he.c
29554+++ b/drivers/atm/he.c
29555@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
29556
29557 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
29558 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
29559- atomic_inc(&vcc->stats->rx_drop);
29560+ atomic_inc_unchecked(&vcc->stats->rx_drop);
29561 goto return_host_buffers;
29562 }
29563
29564@@ -1802,7 +1802,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
29565 RBRQ_LEN_ERR(he_dev->rbrq_head)
29566 ? "LEN_ERR" : "",
29567 vcc->vpi, vcc->vci);
29568- atomic_inc(&vcc->stats->rx_err);
29569+ atomic_inc_unchecked(&vcc->stats->rx_err);
29570 goto return_host_buffers;
29571 }
29572
29573@@ -1861,7 +1861,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
29574 vcc->push(vcc, skb);
29575 spin_lock(&he_dev->global_lock);
29576
29577- atomic_inc(&vcc->stats->rx);
29578+ atomic_inc_unchecked(&vcc->stats->rx);
29579
29580 return_host_buffers:
29581 ++pdus_assembled;
29582@@ -2206,7 +2206,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
29583 tpd->vcc->pop(tpd->vcc, tpd->skb);
29584 else
29585 dev_kfree_skb_any(tpd->skb);
29586- atomic_inc(&tpd->vcc->stats->tx_err);
29587+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
29588 }
29589 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
29590 return;
29591@@ -2618,7 +2618,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
29592 vcc->pop(vcc, skb);
29593 else
29594 dev_kfree_skb_any(skb);
29595- atomic_inc(&vcc->stats->tx_err);
29596+ atomic_inc_unchecked(&vcc->stats->tx_err);
29597 return -EINVAL;
29598 }
29599
29600@@ -2629,7 +2629,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
29601 vcc->pop(vcc, skb);
29602 else
29603 dev_kfree_skb_any(skb);
29604- atomic_inc(&vcc->stats->tx_err);
29605+ atomic_inc_unchecked(&vcc->stats->tx_err);
29606 return -EINVAL;
29607 }
29608 #endif
29609@@ -2641,7 +2641,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
29610 vcc->pop(vcc, skb);
29611 else
29612 dev_kfree_skb_any(skb);
29613- atomic_inc(&vcc->stats->tx_err);
29614+ atomic_inc_unchecked(&vcc->stats->tx_err);
29615 spin_unlock_irqrestore(&he_dev->global_lock, flags);
29616 return -ENOMEM;
29617 }
29618@@ -2683,7 +2683,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
29619 vcc->pop(vcc, skb);
29620 else
29621 dev_kfree_skb_any(skb);
29622- atomic_inc(&vcc->stats->tx_err);
29623+ atomic_inc_unchecked(&vcc->stats->tx_err);
29624 spin_unlock_irqrestore(&he_dev->global_lock, flags);
29625 return -ENOMEM;
29626 }
29627@@ -2714,7 +2714,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
29628 __enqueue_tpd(he_dev, tpd, cid);
29629 spin_unlock_irqrestore(&he_dev->global_lock, flags);
29630
29631- atomic_inc(&vcc->stats->tx);
29632+ atomic_inc_unchecked(&vcc->stats->tx);
29633
29634 return 0;
29635 }
29636diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
29637index 4e49021..01b1512 100644
29638--- a/drivers/atm/horizon.c
29639+++ b/drivers/atm/horizon.c
29640@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
29641 {
29642 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
29643 // VC layer stats
29644- atomic_inc(&vcc->stats->rx);
29645+ atomic_inc_unchecked(&vcc->stats->rx);
29646 __net_timestamp(skb);
29647 // end of our responsability
29648 vcc->push (vcc, skb);
29649@@ -1185,7 +1185,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
29650 dev->tx_iovec = NULL;
29651
29652 // VC layer stats
29653- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
29654+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
29655
29656 // free the skb
29657 hrz_kfree_skb (skb);
29658diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
29659index e33ae00..9deb4ab 100644
29660--- a/drivers/atm/idt77252.c
29661+++ b/drivers/atm/idt77252.c
29662@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
29663 else
29664 dev_kfree_skb(skb);
29665
29666- atomic_inc(&vcc->stats->tx);
29667+ atomic_inc_unchecked(&vcc->stats->tx);
29668 }
29669
29670 atomic_dec(&scq->used);
29671@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29672 if ((sb = dev_alloc_skb(64)) == NULL) {
29673 printk("%s: Can't allocate buffers for aal0.\n",
29674 card->name);
29675- atomic_add(i, &vcc->stats->rx_drop);
29676+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
29677 break;
29678 }
29679 if (!atm_charge(vcc, sb->truesize)) {
29680 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
29681 card->name);
29682- atomic_add(i - 1, &vcc->stats->rx_drop);
29683+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
29684 dev_kfree_skb(sb);
29685 break;
29686 }
29687@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29688 ATM_SKB(sb)->vcc = vcc;
29689 __net_timestamp(sb);
29690 vcc->push(vcc, sb);
29691- atomic_inc(&vcc->stats->rx);
29692+ atomic_inc_unchecked(&vcc->stats->rx);
29693
29694 cell += ATM_CELL_PAYLOAD;
29695 }
29696@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29697 "(CDC: %08x)\n",
29698 card->name, len, rpp->len, readl(SAR_REG_CDC));
29699 recycle_rx_pool_skb(card, rpp);
29700- atomic_inc(&vcc->stats->rx_err);
29701+ atomic_inc_unchecked(&vcc->stats->rx_err);
29702 return;
29703 }
29704 if (stat & SAR_RSQE_CRC) {
29705 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
29706 recycle_rx_pool_skb(card, rpp);
29707- atomic_inc(&vcc->stats->rx_err);
29708+ atomic_inc_unchecked(&vcc->stats->rx_err);
29709 return;
29710 }
29711 if (skb_queue_len(&rpp->queue) > 1) {
29712@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29713 RXPRINTK("%s: Can't alloc RX skb.\n",
29714 card->name);
29715 recycle_rx_pool_skb(card, rpp);
29716- atomic_inc(&vcc->stats->rx_err);
29717+ atomic_inc_unchecked(&vcc->stats->rx_err);
29718 return;
29719 }
29720 if (!atm_charge(vcc, skb->truesize)) {
29721@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29722 __net_timestamp(skb);
29723
29724 vcc->push(vcc, skb);
29725- atomic_inc(&vcc->stats->rx);
29726+ atomic_inc_unchecked(&vcc->stats->rx);
29727
29728 return;
29729 }
29730@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29731 __net_timestamp(skb);
29732
29733 vcc->push(vcc, skb);
29734- atomic_inc(&vcc->stats->rx);
29735+ atomic_inc_unchecked(&vcc->stats->rx);
29736
29737 if (skb->truesize > SAR_FB_SIZE_3)
29738 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
29739@@ -1303,14 +1303,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
29740 if (vcc->qos.aal != ATM_AAL0) {
29741 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
29742 card->name, vpi, vci);
29743- atomic_inc(&vcc->stats->rx_drop);
29744+ atomic_inc_unchecked(&vcc->stats->rx_drop);
29745 goto drop;
29746 }
29747
29748 if ((sb = dev_alloc_skb(64)) == NULL) {
29749 printk("%s: Can't allocate buffers for AAL0.\n",
29750 card->name);
29751- atomic_inc(&vcc->stats->rx_err);
29752+ atomic_inc_unchecked(&vcc->stats->rx_err);
29753 goto drop;
29754 }
29755
29756@@ -1329,7 +1329,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
29757 ATM_SKB(sb)->vcc = vcc;
29758 __net_timestamp(sb);
29759 vcc->push(vcc, sb);
29760- atomic_inc(&vcc->stats->rx);
29761+ atomic_inc_unchecked(&vcc->stats->rx);
29762
29763 drop:
29764 skb_pull(queue, 64);
29765@@ -1954,13 +1954,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
29766
29767 if (vc == NULL) {
29768 printk("%s: NULL connection in send().\n", card->name);
29769- atomic_inc(&vcc->stats->tx_err);
29770+ atomic_inc_unchecked(&vcc->stats->tx_err);
29771 dev_kfree_skb(skb);
29772 return -EINVAL;
29773 }
29774 if (!test_bit(VCF_TX, &vc->flags)) {
29775 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
29776- atomic_inc(&vcc->stats->tx_err);
29777+ atomic_inc_unchecked(&vcc->stats->tx_err);
29778 dev_kfree_skb(skb);
29779 return -EINVAL;
29780 }
29781@@ -1972,14 +1972,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
29782 break;
29783 default:
29784 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
29785- atomic_inc(&vcc->stats->tx_err);
29786+ atomic_inc_unchecked(&vcc->stats->tx_err);
29787 dev_kfree_skb(skb);
29788 return -EINVAL;
29789 }
29790
29791 if (skb_shinfo(skb)->nr_frags != 0) {
29792 printk("%s: No scatter-gather yet.\n", card->name);
29793- atomic_inc(&vcc->stats->tx_err);
29794+ atomic_inc_unchecked(&vcc->stats->tx_err);
29795 dev_kfree_skb(skb);
29796 return -EINVAL;
29797 }
29798@@ -1987,7 +1987,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
29799
29800 err = queue_skb(card, vc, skb, oam);
29801 if (err) {
29802- atomic_inc(&vcc->stats->tx_err);
29803+ atomic_inc_unchecked(&vcc->stats->tx_err);
29804 dev_kfree_skb(skb);
29805 return err;
29806 }
29807@@ -2010,7 +2010,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
29808 skb = dev_alloc_skb(64);
29809 if (!skb) {
29810 printk("%s: Out of memory in send_oam().\n", card->name);
29811- atomic_inc(&vcc->stats->tx_err);
29812+ atomic_inc_unchecked(&vcc->stats->tx_err);
29813 return -ENOMEM;
29814 }
29815 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
29816diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
29817index b2c1b37..faa672b 100644
29818--- a/drivers/atm/iphase.c
29819+++ b/drivers/atm/iphase.c
29820@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
29821 status = (u_short) (buf_desc_ptr->desc_mode);
29822 if (status & (RX_CER | RX_PTE | RX_OFL))
29823 {
29824- atomic_inc(&vcc->stats->rx_err);
29825+ atomic_inc_unchecked(&vcc->stats->rx_err);
29826 IF_ERR(printk("IA: bad packet, dropping it");)
29827 if (status & RX_CER) {
29828 IF_ERR(printk(" cause: packet CRC error\n");)
29829@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)
29830 len = dma_addr - buf_addr;
29831 if (len > iadev->rx_buf_sz) {
29832 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
29833- atomic_inc(&vcc->stats->rx_err);
29834+ atomic_inc_unchecked(&vcc->stats->rx_err);
29835 goto out_free_desc;
29836 }
29837
29838@@ -1296,7 +1296,7 @@ static void rx_dle_intr(struct atm_dev *dev)
29839 ia_vcc = INPH_IA_VCC(vcc);
29840 if (ia_vcc == NULL)
29841 {
29842- atomic_inc(&vcc->stats->rx_err);
29843+ atomic_inc_unchecked(&vcc->stats->rx_err);
29844 dev_kfree_skb_any(skb);
29845 atm_return(vcc, atm_guess_pdu2truesize(len));
29846 goto INCR_DLE;
29847@@ -1308,7 +1308,7 @@ static void rx_dle_intr(struct atm_dev *dev)
29848 if ((length > iadev->rx_buf_sz) || (length >
29849 (skb->len - sizeof(struct cpcs_trailer))))
29850 {
29851- atomic_inc(&vcc->stats->rx_err);
29852+ atomic_inc_unchecked(&vcc->stats->rx_err);
29853 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
29854 length, skb->len);)
29855 dev_kfree_skb_any(skb);
29856@@ -1324,7 +1324,7 @@ static void rx_dle_intr(struct atm_dev *dev)
29857
29858 IF_RX(printk("rx_dle_intr: skb push");)
29859 vcc->push(vcc,skb);
29860- atomic_inc(&vcc->stats->rx);
29861+ atomic_inc_unchecked(&vcc->stats->rx);
29862 iadev->rx_pkt_cnt++;
29863 }
29864 INCR_DLE:
29865@@ -2806,15 +2806,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
29866 {
29867 struct k_sonet_stats *stats;
29868 stats = &PRIV(_ia_dev[board])->sonet_stats;
29869- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
29870- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
29871- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
29872- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
29873- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
29874- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
29875- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
29876- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
29877- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
29878+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
29879+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
29880+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
29881+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
29882+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
29883+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
29884+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
29885+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
29886+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
29887 }
29888 ia_cmds.status = 0;
29889 break;
29890@@ -2919,7 +2919,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
29891 if ((desc == 0) || (desc > iadev->num_tx_desc))
29892 {
29893 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
29894- atomic_inc(&vcc->stats->tx);
29895+ atomic_inc_unchecked(&vcc->stats->tx);
29896 if (vcc->pop)
29897 vcc->pop(vcc, skb);
29898 else
29899@@ -3024,14 +3024,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
29900 ATM_DESC(skb) = vcc->vci;
29901 skb_queue_tail(&iadev->tx_dma_q, skb);
29902
29903- atomic_inc(&vcc->stats->tx);
29904+ atomic_inc_unchecked(&vcc->stats->tx);
29905 iadev->tx_pkt_cnt++;
29906 /* Increment transaction counter */
29907 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
29908
29909 #if 0
29910 /* add flow control logic */
29911- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
29912+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
29913 if (iavcc->vc_desc_cnt > 10) {
29914 vcc->tx_quota = vcc->tx_quota * 3 / 4;
29915 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
29916diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
29917index cf97c34..8d30655 100644
29918--- a/drivers/atm/lanai.c
29919+++ b/drivers/atm/lanai.c
29920@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
29921 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
29922 lanai_endtx(lanai, lvcc);
29923 lanai_free_skb(lvcc->tx.atmvcc, skb);
29924- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
29925+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
29926 }
29927
29928 /* Try to fill the buffer - don't call unless there is backlog */
29929@@ -1428,7 +1428,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
29930 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
29931 __net_timestamp(skb);
29932 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
29933- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
29934+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
29935 out:
29936 lvcc->rx.buf.ptr = end;
29937 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
29938@@ -1670,7 +1670,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
29939 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
29940 "vcc %d\n", lanai->number, (unsigned int) s, vci);
29941 lanai->stats.service_rxnotaal5++;
29942- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
29943+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
29944 return 0;
29945 }
29946 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
29947@@ -1682,7 +1682,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
29948 int bytes;
29949 read_unlock(&vcc_sklist_lock);
29950 DPRINTK("got trashed rx pdu on vci %d\n", vci);
29951- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
29952+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
29953 lvcc->stats.x.aal5.service_trash++;
29954 bytes = (SERVICE_GET_END(s) * 16) -
29955 (((unsigned long) lvcc->rx.buf.ptr) -
29956@@ -1694,7 +1694,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
29957 }
29958 if (s & SERVICE_STREAM) {
29959 read_unlock(&vcc_sklist_lock);
29960- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
29961+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
29962 lvcc->stats.x.aal5.service_stream++;
29963 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
29964 "PDU on VCI %d!\n", lanai->number, vci);
29965@@ -1702,7 +1702,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
29966 return 0;
29967 }
29968 DPRINTK("got rx crc error on vci %d\n", vci);
29969- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
29970+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
29971 lvcc->stats.x.aal5.service_rxcrc++;
29972 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
29973 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
29974diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
29975index 3da804b..d3b0eed 100644
29976--- a/drivers/atm/nicstar.c
29977+++ b/drivers/atm/nicstar.c
29978@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
29979 if ((vc = (vc_map *) vcc->dev_data) == NULL)
29980 {
29981 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", card->index);
29982- atomic_inc(&vcc->stats->tx_err);
29983+ atomic_inc_unchecked(&vcc->stats->tx_err);
29984 dev_kfree_skb_any(skb);
29985 return -EINVAL;
29986 }
29987@@ -1731,7 +1731,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
29988 if (!vc->tx)
29989 {
29990 printk("nicstar%d: Trying to transmit on a non-tx VC.\n", card->index);
29991- atomic_inc(&vcc->stats->tx_err);
29992+ atomic_inc_unchecked(&vcc->stats->tx_err);
29993 dev_kfree_skb_any(skb);
29994 return -EINVAL;
29995 }
29996@@ -1739,7 +1739,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
29997 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0)
29998 {
29999 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n", card->index);
30000- atomic_inc(&vcc->stats->tx_err);
30001+ atomic_inc_unchecked(&vcc->stats->tx_err);
30002 dev_kfree_skb_any(skb);
30003 return -EINVAL;
30004 }
30005@@ -1747,7 +1747,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
30006 if (skb_shinfo(skb)->nr_frags != 0)
30007 {
30008 printk("nicstar%d: No scatter-gather yet.\n", card->index);
30009- atomic_inc(&vcc->stats->tx_err);
30010+ atomic_inc_unchecked(&vcc->stats->tx_err);
30011 dev_kfree_skb_any(skb);
30012 return -EINVAL;
30013 }
30014@@ -1792,11 +1792,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
30015
30016 if (push_scqe(card, vc, scq, &scqe, skb) != 0)
30017 {
30018- atomic_inc(&vcc->stats->tx_err);
30019+ atomic_inc_unchecked(&vcc->stats->tx_err);
30020 dev_kfree_skb_any(skb);
30021 return -EIO;
30022 }
30023- atomic_inc(&vcc->stats->tx);
30024+ atomic_inc_unchecked(&vcc->stats->tx);
30025
30026 return 0;
30027 }
30028@@ -2111,14 +2111,14 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30029 {
30030 printk("nicstar%d: Can't allocate buffers for aal0.\n",
30031 card->index);
30032- atomic_add(i,&vcc->stats->rx_drop);
30033+ atomic_add_unchecked(i,&vcc->stats->rx_drop);
30034 break;
30035 }
30036 if (!atm_charge(vcc, sb->truesize))
30037 {
30038 RXPRINTK("nicstar%d: atm_charge() dropped aal0 packets.\n",
30039 card->index);
30040- atomic_add(i-1,&vcc->stats->rx_drop); /* already increased by 1 */
30041+ atomic_add_unchecked(i-1,&vcc->stats->rx_drop); /* already increased by 1 */
30042 dev_kfree_skb_any(sb);
30043 break;
30044 }
30045@@ -2133,7 +2133,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30046 ATM_SKB(sb)->vcc = vcc;
30047 __net_timestamp(sb);
30048 vcc->push(vcc, sb);
30049- atomic_inc(&vcc->stats->rx);
30050+ atomic_inc_unchecked(&vcc->stats->rx);
30051 cell += ATM_CELL_PAYLOAD;
30052 }
30053
30054@@ -2152,7 +2152,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30055 if (iovb == NULL)
30056 {
30057 printk("nicstar%d: Out of iovec buffers.\n", card->index);
30058- atomic_inc(&vcc->stats->rx_drop);
30059+ atomic_inc_unchecked(&vcc->stats->rx_drop);
30060 recycle_rx_buf(card, skb);
30061 return;
30062 }
30063@@ -2182,7 +2182,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30064 else if (NS_SKB(iovb)->iovcnt >= NS_MAX_IOVECS)
30065 {
30066 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
30067- atomic_inc(&vcc->stats->rx_err);
30068+ atomic_inc_unchecked(&vcc->stats->rx_err);
30069 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, NS_MAX_IOVECS);
30070 NS_SKB(iovb)->iovcnt = 0;
30071 iovb->len = 0;
30072@@ -2202,7 +2202,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30073 printk("nicstar%d: Expected a small buffer, and this is not one.\n",
30074 card->index);
30075 which_list(card, skb);
30076- atomic_inc(&vcc->stats->rx_err);
30077+ atomic_inc_unchecked(&vcc->stats->rx_err);
30078 recycle_rx_buf(card, skb);
30079 vc->rx_iov = NULL;
30080 recycle_iov_buf(card, iovb);
30081@@ -2216,7 +2216,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30082 printk("nicstar%d: Expected a large buffer, and this is not one.\n",
30083 card->index);
30084 which_list(card, skb);
30085- atomic_inc(&vcc->stats->rx_err);
30086+ atomic_inc_unchecked(&vcc->stats->rx_err);
30087 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
30088 NS_SKB(iovb)->iovcnt);
30089 vc->rx_iov = NULL;
30090@@ -2240,7 +2240,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30091 printk(" - PDU size mismatch.\n");
30092 else
30093 printk(".\n");
30094- atomic_inc(&vcc->stats->rx_err);
30095+ atomic_inc_unchecked(&vcc->stats->rx_err);
30096 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
30097 NS_SKB(iovb)->iovcnt);
30098 vc->rx_iov = NULL;
30099@@ -2256,7 +2256,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30100 if (!atm_charge(vcc, skb->truesize))
30101 {
30102 push_rxbufs(card, skb);
30103- atomic_inc(&vcc->stats->rx_drop);
30104+ atomic_inc_unchecked(&vcc->stats->rx_drop);
30105 }
30106 else
30107 {
30108@@ -2268,7 +2268,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30109 ATM_SKB(skb)->vcc = vcc;
30110 __net_timestamp(skb);
30111 vcc->push(vcc, skb);
30112- atomic_inc(&vcc->stats->rx);
30113+ atomic_inc_unchecked(&vcc->stats->rx);
30114 }
30115 }
30116 else if (NS_SKB(iovb)->iovcnt == 2) /* One small plus one large buffer */
30117@@ -2283,7 +2283,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30118 if (!atm_charge(vcc, sb->truesize))
30119 {
30120 push_rxbufs(card, sb);
30121- atomic_inc(&vcc->stats->rx_drop);
30122+ atomic_inc_unchecked(&vcc->stats->rx_drop);
30123 }
30124 else
30125 {
30126@@ -2295,7 +2295,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30127 ATM_SKB(sb)->vcc = vcc;
30128 __net_timestamp(sb);
30129 vcc->push(vcc, sb);
30130- atomic_inc(&vcc->stats->rx);
30131+ atomic_inc_unchecked(&vcc->stats->rx);
30132 }
30133
30134 push_rxbufs(card, skb);
30135@@ -2306,7 +2306,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30136 if (!atm_charge(vcc, skb->truesize))
30137 {
30138 push_rxbufs(card, skb);
30139- atomic_inc(&vcc->stats->rx_drop);
30140+ atomic_inc_unchecked(&vcc->stats->rx_drop);
30141 }
30142 else
30143 {
30144@@ -2320,7 +2320,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30145 ATM_SKB(skb)->vcc = vcc;
30146 __net_timestamp(skb);
30147 vcc->push(vcc, skb);
30148- atomic_inc(&vcc->stats->rx);
30149+ atomic_inc_unchecked(&vcc->stats->rx);
30150 }
30151
30152 push_rxbufs(card, sb);
30153@@ -2342,7 +2342,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30154 if (hb == NULL)
30155 {
30156 printk("nicstar%d: Out of huge buffers.\n", card->index);
30157- atomic_inc(&vcc->stats->rx_drop);
30158+ atomic_inc_unchecked(&vcc->stats->rx_drop);
30159 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
30160 NS_SKB(iovb)->iovcnt);
30161 vc->rx_iov = NULL;
30162@@ -2393,7 +2393,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30163 }
30164 else
30165 dev_kfree_skb_any(hb);
30166- atomic_inc(&vcc->stats->rx_drop);
30167+ atomic_inc_unchecked(&vcc->stats->rx_drop);
30168 }
30169 else
30170 {
30171@@ -2427,7 +2427,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30172 #endif /* NS_USE_DESTRUCTORS */
30173 __net_timestamp(hb);
30174 vcc->push(vcc, hb);
30175- atomic_inc(&vcc->stats->rx);
30176+ atomic_inc_unchecked(&vcc->stats->rx);
30177 }
30178 }
30179
30180diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
30181index 84c93ff..e6ed269 100644
30182--- a/drivers/atm/solos-pci.c
30183+++ b/drivers/atm/solos-pci.c
30184@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
30185 }
30186 atm_charge(vcc, skb->truesize);
30187 vcc->push(vcc, skb);
30188- atomic_inc(&vcc->stats->rx);
30189+ atomic_inc_unchecked(&vcc->stats->rx);
30190 break;
30191
30192 case PKT_STATUS:
30193@@ -914,6 +914,8 @@ static int print_buffer(struct sk_buff *buf)
30194 char msg[500];
30195 char item[10];
30196
30197+ pax_track_stack();
30198+
30199 len = buf->len;
30200 for (i = 0; i < len; i++){
30201 if(i % 8 == 0)
30202@@ -1023,7 +1025,7 @@ static uint32_t fpga_tx(struct solos_card *card)
30203 vcc = SKB_CB(oldskb)->vcc;
30204
30205 if (vcc) {
30206- atomic_inc(&vcc->stats->tx);
30207+ atomic_inc_unchecked(&vcc->stats->tx);
30208 solos_pop(vcc, oldskb);
30209 } else
30210 dev_kfree_skb_irq(oldskb);
30211diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
30212index 6dd3f59..ee377f3 100644
30213--- a/drivers/atm/suni.c
30214+++ b/drivers/atm/suni.c
30215@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
30216
30217
30218 #define ADD_LIMITED(s,v) \
30219- atomic_add((v),&stats->s); \
30220- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
30221+ atomic_add_unchecked((v),&stats->s); \
30222+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
30223
30224
30225 static void suni_hz(unsigned long from_timer)
30226diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
30227index fc8cb07..4a80e53 100644
30228--- a/drivers/atm/uPD98402.c
30229+++ b/drivers/atm/uPD98402.c
30230@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
30231 struct sonet_stats tmp;
30232 int error = 0;
30233
30234- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
30235+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
30236 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
30237 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
30238 if (zero && !error) {
30239@@ -160,9 +160,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
30240
30241
30242 #define ADD_LIMITED(s,v) \
30243- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
30244- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
30245- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
30246+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
30247+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
30248+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
30249
30250
30251 static void stat_event(struct atm_dev *dev)
30252@@ -193,7 +193,7 @@ static void uPD98402_int(struct atm_dev *dev)
30253 if (reason & uPD98402_INT_PFM) stat_event(dev);
30254 if (reason & uPD98402_INT_PCO) {
30255 (void) GET(PCOCR); /* clear interrupt cause */
30256- atomic_add(GET(HECCT),
30257+ atomic_add_unchecked(GET(HECCT),
30258 &PRIV(dev)->sonet_stats.uncorr_hcs);
30259 }
30260 if ((reason & uPD98402_INT_RFO) &&
30261@@ -221,9 +221,9 @@ static int uPD98402_start(struct atm_dev *dev)
30262 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
30263 uPD98402_INT_LOS),PIMR); /* enable them */
30264 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
30265- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
30266- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
30267- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
30268+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
30269+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
30270+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
30271 return 0;
30272 }
30273
30274diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
30275index 2e9635b..32927b4 100644
30276--- a/drivers/atm/zatm.c
30277+++ b/drivers/atm/zatm.c
30278@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
30279 }
30280 if (!size) {
30281 dev_kfree_skb_irq(skb);
30282- if (vcc) atomic_inc(&vcc->stats->rx_err);
30283+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
30284 continue;
30285 }
30286 if (!atm_charge(vcc,skb->truesize)) {
30287@@ -468,7 +468,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
30288 skb->len = size;
30289 ATM_SKB(skb)->vcc = vcc;
30290 vcc->push(vcc,skb);
30291- atomic_inc(&vcc->stats->rx);
30292+ atomic_inc_unchecked(&vcc->stats->rx);
30293 }
30294 zout(pos & 0xffff,MTA(mbx));
30295 #if 0 /* probably a stupid idea */
30296@@ -732,7 +732,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
30297 skb_queue_head(&zatm_vcc->backlog,skb);
30298 break;
30299 }
30300- atomic_inc(&vcc->stats->tx);
30301+ atomic_inc_unchecked(&vcc->stats->tx);
30302 wake_up(&zatm_vcc->tx_wait);
30303 }
30304
30305diff --git a/drivers/base/bus.c b/drivers/base/bus.c
30306index 63c143e..fece183 100644
30307--- a/drivers/base/bus.c
30308+++ b/drivers/base/bus.c
30309@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kobject *kobj, struct attribute *attr,
30310 return ret;
30311 }
30312
30313-static struct sysfs_ops driver_sysfs_ops = {
30314+static const struct sysfs_ops driver_sysfs_ops = {
30315 .show = drv_attr_show,
30316 .store = drv_attr_store,
30317 };
30318@@ -115,7 +115,7 @@ static ssize_t bus_attr_store(struct kobject *kobj, struct attribute *attr,
30319 return ret;
30320 }
30321
30322-static struct sysfs_ops bus_sysfs_ops = {
30323+static const struct sysfs_ops bus_sysfs_ops = {
30324 .show = bus_attr_show,
30325 .store = bus_attr_store,
30326 };
30327@@ -154,7 +154,7 @@ static int bus_uevent_filter(struct kset *kset, struct kobject *kobj)
30328 return 0;
30329 }
30330
30331-static struct kset_uevent_ops bus_uevent_ops = {
30332+static const struct kset_uevent_ops bus_uevent_ops = {
30333 .filter = bus_uevent_filter,
30334 };
30335
30336diff --git a/drivers/base/class.c b/drivers/base/class.c
30337index 6e2c3b0..cb61871 100644
30338--- a/drivers/base/class.c
30339+++ b/drivers/base/class.c
30340@@ -63,7 +63,7 @@ static void class_release(struct kobject *kobj)
30341 kfree(cp);
30342 }
30343
30344-static struct sysfs_ops class_sysfs_ops = {
30345+static const struct sysfs_ops class_sysfs_ops = {
30346 .show = class_attr_show,
30347 .store = class_attr_store,
30348 };
30349diff --git a/drivers/base/core.c b/drivers/base/core.c
30350index f33d768..a9358d0 100644
30351--- a/drivers/base/core.c
30352+++ b/drivers/base/core.c
30353@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kobject *kobj, struct attribute *attr,
30354 return ret;
30355 }
30356
30357-static struct sysfs_ops dev_sysfs_ops = {
30358+static const struct sysfs_ops dev_sysfs_ops = {
30359 .show = dev_attr_show,
30360 .store = dev_attr_store,
30361 };
30362@@ -252,7 +252,7 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj,
30363 return retval;
30364 }
30365
30366-static struct kset_uevent_ops device_uevent_ops = {
30367+static const struct kset_uevent_ops device_uevent_ops = {
30368 .filter = dev_uevent_filter,
30369 .name = dev_uevent_name,
30370 .uevent = dev_uevent,
30371diff --git a/drivers/base/memory.c b/drivers/base/memory.c
30372index 989429c..2272b00 100644
30373--- a/drivers/base/memory.c
30374+++ b/drivers/base/memory.c
30375@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *kset, struct kobject *obj, struct kobj_uev
30376 return retval;
30377 }
30378
30379-static struct kset_uevent_ops memory_uevent_ops = {
30380+static const struct kset_uevent_ops memory_uevent_ops = {
30381 .name = memory_uevent_name,
30382 .uevent = memory_uevent,
30383 };
30384diff --git a/drivers/base/sys.c b/drivers/base/sys.c
30385index 3f202f7..61c4a6f 100644
30386--- a/drivers/base/sys.c
30387+++ b/drivers/base/sys.c
30388@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struct attribute *attr,
30389 return -EIO;
30390 }
30391
30392-static struct sysfs_ops sysfs_ops = {
30393+static const struct sysfs_ops sysfs_ops = {
30394 .show = sysdev_show,
30395 .store = sysdev_store,
30396 };
30397@@ -104,7 +104,7 @@ static ssize_t sysdev_class_store(struct kobject *kobj, struct attribute *attr,
30398 return -EIO;
30399 }
30400
30401-static struct sysfs_ops sysfs_class_ops = {
30402+static const struct sysfs_ops sysfs_class_ops = {
30403 .show = sysdev_class_show,
30404 .store = sysdev_class_store,
30405 };
30406diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
30407index eb4fa19..1954777 100644
30408--- a/drivers/block/DAC960.c
30409+++ b/drivers/block/DAC960.c
30410@@ -1973,6 +1973,8 @@ static bool DAC960_V1_ReadDeviceConfiguration(DAC960_Controller_T
30411 unsigned long flags;
30412 int Channel, TargetID;
30413
30414+ pax_track_stack();
30415+
30416 if (!init_dma_loaf(Controller->PCIDevice, &local_dma,
30417 DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
30418 sizeof(DAC960_SCSI_Inquiry_T) +
30419diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
30420index 68b90d9..7e2e3f3 100644
30421--- a/drivers/block/cciss.c
30422+++ b/drivers/block/cciss.c
30423@@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
30424 int err;
30425 u32 cp;
30426
30427+ memset(&arg64, 0, sizeof(arg64));
30428+
30429 err = 0;
30430 err |=
30431 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
30432@@ -2852,7 +2854,7 @@ static unsigned long pollcomplete(int ctlr)
30433 /* Wait (up to 20 seconds) for a command to complete */
30434
30435 for (i = 20 * HZ; i > 0; i--) {
30436- done = hba[ctlr]->access.command_completed(hba[ctlr]);
30437+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
30438 if (done == FIFO_EMPTY)
30439 schedule_timeout_uninterruptible(1);
30440 else
30441@@ -2876,7 +2878,7 @@ static int sendcmd_core(ctlr_info_t *h, CommandList_struct *c)
30442 resend_cmd1:
30443
30444 /* Disable interrupt on the board. */
30445- h->access.set_intr_mask(h, CCISS_INTR_OFF);
30446+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
30447
30448 /* Make sure there is room in the command FIFO */
30449 /* Actually it should be completely empty at this time */
30450@@ -2884,13 +2886,13 @@ resend_cmd1:
30451 /* tape side of the driver. */
30452 for (i = 200000; i > 0; i--) {
30453 /* if fifo isn't full go */
30454- if (!(h->access.fifo_full(h)))
30455+ if (!(h->access->fifo_full(h)))
30456 break;
30457 udelay(10);
30458 printk(KERN_WARNING "cciss cciss%d: SendCmd FIFO full,"
30459 " waiting!\n", h->ctlr);
30460 }
30461- h->access.submit_command(h, c); /* Send the cmd */
30462+ h->access->submit_command(h, c); /* Send the cmd */
30463 do {
30464 complete = pollcomplete(h->ctlr);
30465
30466@@ -3023,7 +3025,7 @@ static void start_io(ctlr_info_t *h)
30467 while (!hlist_empty(&h->reqQ)) {
30468 c = hlist_entry(h->reqQ.first, CommandList_struct, list);
30469 /* can't do anything if fifo is full */
30470- if ((h->access.fifo_full(h))) {
30471+ if ((h->access->fifo_full(h))) {
30472 printk(KERN_WARNING "cciss: fifo full\n");
30473 break;
30474 }
30475@@ -3033,7 +3035,7 @@ static void start_io(ctlr_info_t *h)
30476 h->Qdepth--;
30477
30478 /* Tell the controller execute command */
30479- h->access.submit_command(h, c);
30480+ h->access->submit_command(h, c);
30481
30482 /* Put job onto the completed Q */
30483 addQ(&h->cmpQ, c);
30484@@ -3393,17 +3395,17 @@ startio:
30485
30486 static inline unsigned long get_next_completion(ctlr_info_t *h)
30487 {
30488- return h->access.command_completed(h);
30489+ return h->access->command_completed(h);
30490 }
30491
30492 static inline int interrupt_pending(ctlr_info_t *h)
30493 {
30494- return h->access.intr_pending(h);
30495+ return h->access->intr_pending(h);
30496 }
30497
30498 static inline long interrupt_not_for_us(ctlr_info_t *h)
30499 {
30500- return (((h->access.intr_pending(h) == 0) ||
30501+ return (((h->access->intr_pending(h) == 0) ||
30502 (h->interrupts_enabled == 0)));
30503 }
30504
30505@@ -3892,7 +3894,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
30506 */
30507 c->max_commands = readl(&(c->cfgtable->CmdsOutMax));
30508 c->product_name = products[prod_index].product_name;
30509- c->access = *(products[prod_index].access);
30510+ c->access = products[prod_index].access;
30511 c->nr_cmds = c->max_commands - 4;
30512 if ((readb(&c->cfgtable->Signature[0]) != 'C') ||
30513 (readb(&c->cfgtable->Signature[1]) != 'I') ||
30514@@ -4291,7 +4293,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
30515 }
30516
30517 /* make sure the board interrupts are off */
30518- hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);
30519+ hba[i]->access->set_intr_mask(hba[i], CCISS_INTR_OFF);
30520 if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr,
30521 IRQF_DISABLED | IRQF_SHARED, hba[i]->devname, hba[i])) {
30522 printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
30523@@ -4341,7 +4343,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
30524 cciss_scsi_setup(i);
30525
30526 /* Turn the interrupts on so we can service requests */
30527- hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_ON);
30528+ hba[i]->access->set_intr_mask(hba[i], CCISS_INTR_ON);
30529
30530 /* Get the firmware version */
30531 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
30532diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
30533index 04d6bf8..36e712d 100644
30534--- a/drivers/block/cciss.h
30535+++ b/drivers/block/cciss.h
30536@@ -90,7 +90,7 @@ struct ctlr_info
30537 // information about each logical volume
30538 drive_info_struct *drv[CISS_MAX_LUN];
30539
30540- struct access_method access;
30541+ struct access_method *access;
30542
30543 /* queue and queue Info */
30544 struct hlist_head reqQ;
30545diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
30546index 6422651..bb1bdef 100644
30547--- a/drivers/block/cpqarray.c
30548+++ b/drivers/block/cpqarray.c
30549@@ -402,7 +402,7 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)
30550 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
30551 goto Enomem4;
30552 }
30553- hba[i]->access.set_intr_mask(hba[i], 0);
30554+ hba[i]->access->set_intr_mask(hba[i], 0);
30555 if (request_irq(hba[i]->intr, do_ida_intr,
30556 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
30557 {
30558@@ -460,7 +460,7 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)
30559 add_timer(&hba[i]->timer);
30560
30561 /* Enable IRQ now that spinlock and rate limit timer are set up */
30562- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
30563+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
30564
30565 for(j=0; j<NWD; j++) {
30566 struct gendisk *disk = ida_gendisk[i][j];
30567@@ -695,7 +695,7 @@ DBGINFO(
30568 for(i=0; i<NR_PRODUCTS; i++) {
30569 if (board_id == products[i].board_id) {
30570 c->product_name = products[i].product_name;
30571- c->access = *(products[i].access);
30572+ c->access = products[i].access;
30573 break;
30574 }
30575 }
30576@@ -793,7 +793,7 @@ static int __init cpqarray_eisa_detect(void)
30577 hba[ctlr]->intr = intr;
30578 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
30579 hba[ctlr]->product_name = products[j].product_name;
30580- hba[ctlr]->access = *(products[j].access);
30581+ hba[ctlr]->access = products[j].access;
30582 hba[ctlr]->ctlr = ctlr;
30583 hba[ctlr]->board_id = board_id;
30584 hba[ctlr]->pci_dev = NULL; /* not PCI */
30585@@ -896,6 +896,8 @@ static void do_ida_request(struct request_queue *q)
30586 struct scatterlist tmp_sg[SG_MAX];
30587 int i, dir, seg;
30588
30589+ pax_track_stack();
30590+
30591 if (blk_queue_plugged(q))
30592 goto startio;
30593
30594@@ -968,7 +970,7 @@ static void start_io(ctlr_info_t *h)
30595
30596 while((c = h->reqQ) != NULL) {
30597 /* Can't do anything if we're busy */
30598- if (h->access.fifo_full(h) == 0)
30599+ if (h->access->fifo_full(h) == 0)
30600 return;
30601
30602 /* Get the first entry from the request Q */
30603@@ -976,7 +978,7 @@ static void start_io(ctlr_info_t *h)
30604 h->Qdepth--;
30605
30606 /* Tell the controller to do our bidding */
30607- h->access.submit_command(h, c);
30608+ h->access->submit_command(h, c);
30609
30610 /* Get onto the completion Q */
30611 addQ(&h->cmpQ, c);
30612@@ -1038,7 +1040,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
30613 unsigned long flags;
30614 __u32 a,a1;
30615
30616- istat = h->access.intr_pending(h);
30617+ istat = h->access->intr_pending(h);
30618 /* Is this interrupt for us? */
30619 if (istat == 0)
30620 return IRQ_NONE;
30621@@ -1049,7 +1051,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
30622 */
30623 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
30624 if (istat & FIFO_NOT_EMPTY) {
30625- while((a = h->access.command_completed(h))) {
30626+ while((a = h->access->command_completed(h))) {
30627 a1 = a; a &= ~3;
30628 if ((c = h->cmpQ) == NULL)
30629 {
30630@@ -1434,11 +1436,11 @@ static int sendcmd(
30631 /*
30632 * Disable interrupt
30633 */
30634- info_p->access.set_intr_mask(info_p, 0);
30635+ info_p->access->set_intr_mask(info_p, 0);
30636 /* Make sure there is room in the command FIFO */
30637 /* Actually it should be completely empty at this time. */
30638 for (i = 200000; i > 0; i--) {
30639- temp = info_p->access.fifo_full(info_p);
30640+ temp = info_p->access->fifo_full(info_p);
30641 if (temp != 0) {
30642 break;
30643 }
30644@@ -1451,7 +1453,7 @@ DBG(
30645 /*
30646 * Send the cmd
30647 */
30648- info_p->access.submit_command(info_p, c);
30649+ info_p->access->submit_command(info_p, c);
30650 complete = pollcomplete(ctlr);
30651
30652 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
30653@@ -1534,9 +1536,9 @@ static int revalidate_allvol(ctlr_info_t *host)
30654 * we check the new geometry. Then turn interrupts back on when
30655 * we're done.
30656 */
30657- host->access.set_intr_mask(host, 0);
30658+ host->access->set_intr_mask(host, 0);
30659 getgeometry(ctlr);
30660- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
30661+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
30662
30663 for(i=0; i<NWD; i++) {
30664 struct gendisk *disk = ida_gendisk[ctlr][i];
30665@@ -1576,7 +1578,7 @@ static int pollcomplete(int ctlr)
30666 /* Wait (up to 2 seconds) for a command to complete */
30667
30668 for (i = 200000; i > 0; i--) {
30669- done = hba[ctlr]->access.command_completed(hba[ctlr]);
30670+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
30671 if (done == 0) {
30672 udelay(10); /* a short fixed delay */
30673 } else
30674diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
30675index be73e9d..7fbf140 100644
30676--- a/drivers/block/cpqarray.h
30677+++ b/drivers/block/cpqarray.h
30678@@ -99,7 +99,7 @@ struct ctlr_info {
30679 drv_info_t drv[NWD];
30680 struct proc_dir_entry *proc;
30681
30682- struct access_method access;
30683+ struct access_method *access;
30684
30685 cmdlist_t *reqQ;
30686 cmdlist_t *cmpQ;
30687diff --git a/drivers/block/loop.c b/drivers/block/loop.c
30688index 8ec2d70..2804b30 100644
30689--- a/drivers/block/loop.c
30690+++ b/drivers/block/loop.c
30691@@ -282,7 +282,7 @@ static int __do_lo_send_write(struct file *file,
30692 mm_segment_t old_fs = get_fs();
30693
30694 set_fs(get_ds());
30695- bw = file->f_op->write(file, buf, len, &pos);
30696+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
30697 set_fs(old_fs);
30698 if (likely(bw == len))
30699 return 0;
30700diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
30701index 26ada47..083c480 100644
30702--- a/drivers/block/nbd.c
30703+++ b/drivers/block/nbd.c
30704@@ -155,6 +155,8 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size,
30705 struct kvec iov;
30706 sigset_t blocked, oldset;
30707
30708+ pax_track_stack();
30709+
30710 if (unlikely(!sock)) {
30711 printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n",
30712 lo->disk->disk_name, (send ? "send" : "recv"));
30713@@ -569,6 +571,8 @@ static void do_nbd_request(struct request_queue *q)
30714 static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
30715 unsigned int cmd, unsigned long arg)
30716 {
30717+ pax_track_stack();
30718+
30719 switch (cmd) {
30720 case NBD_DISCONNECT: {
30721 struct request sreq;
30722diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
30723index a5d585d..d087be3 100644
30724--- a/drivers/block/pktcdvd.c
30725+++ b/drivers/block/pktcdvd.c
30726@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kobject *kobj,
30727 return len;
30728 }
30729
30730-static struct sysfs_ops kobj_pkt_ops = {
30731+static const struct sysfs_ops kobj_pkt_ops = {
30732 .show = kobj_pkt_show,
30733 .store = kobj_pkt_store
30734 };
30735diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
30736index 6aad99e..89cd142 100644
30737--- a/drivers/char/Kconfig
30738+++ b/drivers/char/Kconfig
30739@@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING
30740
30741 config DEVKMEM
30742 bool "/dev/kmem virtual device support"
30743- default y
30744+ default n
30745+ depends on !GRKERNSEC_KMEM
30746 help
30747 Say Y here if you want to support the /dev/kmem device. The
30748 /dev/kmem device is rarely used, but can be used for certain
30749@@ -1114,6 +1115,7 @@ config DEVPORT
30750 bool
30751 depends on !M68K
30752 depends on ISA || PCI
30753+ depends on !GRKERNSEC_KMEM
30754 default y
30755
30756 source "drivers/s390/char/Kconfig"
30757diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
30758index a96f319..a778a5b 100644
30759--- a/drivers/char/agp/frontend.c
30760+++ b/drivers/char/agp/frontend.c
30761@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
30762 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
30763 return -EFAULT;
30764
30765- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
30766+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
30767 return -EFAULT;
30768
30769 client = agp_find_client_by_pid(reserve.pid);
30770diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
30771index d8cff90..9628e70 100644
30772--- a/drivers/char/briq_panel.c
30773+++ b/drivers/char/briq_panel.c
30774@@ -10,6 +10,7 @@
30775 #include <linux/types.h>
30776 #include <linux/errno.h>
30777 #include <linux/tty.h>
30778+#include <linux/mutex.h>
30779 #include <linux/timer.h>
30780 #include <linux/kernel.h>
30781 #include <linux/wait.h>
30782@@ -36,6 +37,7 @@ static int vfd_is_open;
30783 static unsigned char vfd[40];
30784 static int vfd_cursor;
30785 static unsigned char ledpb, led;
30786+static DEFINE_MUTEX(vfd_mutex);
30787
30788 static void update_vfd(void)
30789 {
30790@@ -142,12 +144,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
30791 if (!vfd_is_open)
30792 return -EBUSY;
30793
30794+ mutex_lock(&vfd_mutex);
30795 for (;;) {
30796 char c;
30797 if (!indx)
30798 break;
30799- if (get_user(c, buf))
30800+ if (get_user(c, buf)) {
30801+ mutex_unlock(&vfd_mutex);
30802 return -EFAULT;
30803+ }
30804 if (esc) {
30805 set_led(c);
30806 esc = 0;
30807@@ -177,6 +182,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
30808 buf++;
30809 }
30810 update_vfd();
30811+ mutex_unlock(&vfd_mutex);
30812
30813 return len;
30814 }
30815diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
30816index 31e7c91..161afc0 100644
30817--- a/drivers/char/genrtc.c
30818+++ b/drivers/char/genrtc.c
30819@@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct inode *inode, struct file *file,
30820 switch (cmd) {
30821
30822 case RTC_PLL_GET:
30823+ memset(&pll, 0, sizeof(pll));
30824 if (get_rtc_pll(&pll))
30825 return -EINVAL;
30826 else
30827diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
30828index 006466d..a2bb21c 100644
30829--- a/drivers/char/hpet.c
30830+++ b/drivers/char/hpet.c
30831@@ -430,7 +430,7 @@ static int hpet_release(struct inode *inode, struct file *file)
30832 return 0;
30833 }
30834
30835-static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
30836+static int hpet_ioctl_common(struct hpet_dev *, unsigned int, unsigned long, int);
30837
30838 static int
30839 hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
30840@@ -565,7 +565,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
30841 }
30842
30843 static int
30844-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
30845+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg, int kernel)
30846 {
30847 struct hpet_timer __iomem *timer;
30848 struct hpet __iomem *hpet;
30849@@ -608,11 +608,11 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
30850 {
30851 struct hpet_info info;
30852
30853+ memset(&info, 0, sizeof(info));
30854+
30855 if (devp->hd_ireqfreq)
30856 info.hi_ireqfreq =
30857 hpet_time_div(hpetp, devp->hd_ireqfreq);
30858- else
30859- info.hi_ireqfreq = 0;
30860 info.hi_flags =
30861 readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
30862 info.hi_hpet = hpetp->hp_which;
30863diff --git a/drivers/char/hvc_beat.c b/drivers/char/hvc_beat.c
30864index 0afc8b8..6913fc3 100644
30865--- a/drivers/char/hvc_beat.c
30866+++ b/drivers/char/hvc_beat.c
30867@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t vtermno, const char *buf, int cnt)
30868 return cnt;
30869 }
30870
30871-static struct hv_ops hvc_beat_get_put_ops = {
30872+static const struct hv_ops hvc_beat_get_put_ops = {
30873 .get_chars = hvc_beat_get_chars,
30874 .put_chars = hvc_beat_put_chars,
30875 };
30876diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
30877index 98097f2..407dddc 100644
30878--- a/drivers/char/hvc_console.c
30879+++ b/drivers/char/hvc_console.c
30880@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_index(int index)
30881 * console interfaces but can still be used as a tty device. This has to be
30882 * static because kmalloc will not work during early console init.
30883 */
30884-static struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
30885+static const struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
30886 static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] =
30887 {[0 ... MAX_NR_HVC_CONSOLES - 1] = -1};
30888
30889@@ -249,7 +249,7 @@ static void destroy_hvc_struct(struct kref *kref)
30890 * vty adapters do NOT get an hvc_instantiate() callback since they
30891 * appear after early console init.
30892 */
30893-int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops)
30894+int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
30895 {
30896 struct hvc_struct *hp;
30897
30898@@ -758,7 +758,7 @@ static const struct tty_operations hvc_ops = {
30899 };
30900
30901 struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data,
30902- struct hv_ops *ops, int outbuf_size)
30903+ const struct hv_ops *ops, int outbuf_size)
30904 {
30905 struct hvc_struct *hp;
30906 int i;
30907diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h
30908index 10950ca..ed176c3 100644
30909--- a/drivers/char/hvc_console.h
30910+++ b/drivers/char/hvc_console.h
30911@@ -55,7 +55,7 @@ struct hvc_struct {
30912 int outbuf_size;
30913 int n_outbuf;
30914 uint32_t vtermno;
30915- struct hv_ops *ops;
30916+ const struct hv_ops *ops;
30917 int irq_requested;
30918 int data;
30919 struct winsize ws;
30920@@ -76,11 +76,11 @@ struct hv_ops {
30921 };
30922
30923 /* Register a vterm and a slot index for use as a console (console_init) */
30924-extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
30925+extern int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops);
30926
30927 /* register a vterm for hvc tty operation (module_init or hotplug add) */
30928 extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data,
30929- struct hv_ops *ops, int outbuf_size);
30930+ const struct hv_ops *ops, int outbuf_size);
30931 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
30932 extern int hvc_remove(struct hvc_struct *hp);
30933
30934diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
30935index 936d05b..fd02426 100644
30936--- a/drivers/char/hvc_iseries.c
30937+++ b/drivers/char/hvc_iseries.c
30938@@ -197,7 +197,7 @@ done:
30939 return sent;
30940 }
30941
30942-static struct hv_ops hvc_get_put_ops = {
30943+static const struct hv_ops hvc_get_put_ops = {
30944 .get_chars = get_chars,
30945 .put_chars = put_chars,
30946 .notifier_add = notifier_add_irq,
30947diff --git a/drivers/char/hvc_iucv.c b/drivers/char/hvc_iucv.c
30948index b0e168f..69cda2a 100644
30949--- a/drivers/char/hvc_iucv.c
30950+++ b/drivers/char/hvc_iucv.c
30951@@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(struct device *dev)
30952
30953
30954 /* HVC operations */
30955-static struct hv_ops hvc_iucv_ops = {
30956+static const struct hv_ops hvc_iucv_ops = {
30957 .get_chars = hvc_iucv_get_chars,
30958 .put_chars = hvc_iucv_put_chars,
30959 .notifier_add = hvc_iucv_notifier_add,
30960diff --git a/drivers/char/hvc_rtas.c b/drivers/char/hvc_rtas.c
30961index 88590d0..61c4a61 100644
30962--- a/drivers/char/hvc_rtas.c
30963+++ b/drivers/char/hvc_rtas.c
30964@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_t vtermno, char *buf, int count)
30965 return i;
30966 }
30967
30968-static struct hv_ops hvc_rtas_get_put_ops = {
30969+static const struct hv_ops hvc_rtas_get_put_ops = {
30970 .get_chars = hvc_rtas_read_console,
30971 .put_chars = hvc_rtas_write_console,
30972 };
30973diff --git a/drivers/char/hvc_udbg.c b/drivers/char/hvc_udbg.c
30974index bd63ba8..b0957e6 100644
30975--- a/drivers/char/hvc_udbg.c
30976+++ b/drivers/char/hvc_udbg.c
30977@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno, char *buf, int count)
30978 return i;
30979 }
30980
30981-static struct hv_ops hvc_udbg_ops = {
30982+static const struct hv_ops hvc_udbg_ops = {
30983 .get_chars = hvc_udbg_get,
30984 .put_chars = hvc_udbg_put,
30985 };
30986diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
30987index 10be343..27370e9 100644
30988--- a/drivers/char/hvc_vio.c
30989+++ b/drivers/char/hvc_vio.c
30990@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t vtermno, char *buf, int count)
30991 return got;
30992 }
30993
30994-static struct hv_ops hvc_get_put_ops = {
30995+static const struct hv_ops hvc_get_put_ops = {
30996 .get_chars = filtered_get_chars,
30997 .put_chars = hvc_put_chars,
30998 .notifier_add = notifier_add_irq,
30999diff --git a/drivers/char/hvc_xen.c b/drivers/char/hvc_xen.c
31000index a6ee32b..94f8c26 100644
31001--- a/drivers/char/hvc_xen.c
31002+++ b/drivers/char/hvc_xen.c
31003@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno, char *buf, int len)
31004 return recv;
31005 }
31006
31007-static struct hv_ops hvc_ops = {
31008+static const struct hv_ops hvc_ops = {
31009 .get_chars = read_console,
31010 .put_chars = write_console,
31011 .notifier_add = notifier_add_irq,
31012diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
31013index 266b858..f3ee0bb 100644
31014--- a/drivers/char/hvcs.c
31015+++ b/drivers/char/hvcs.c
31016@@ -82,6 +82,7 @@
31017 #include <asm/hvcserver.h>
31018 #include <asm/uaccess.h>
31019 #include <asm/vio.h>
31020+#include <asm/local.h>
31021
31022 /*
31023 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
31024@@ -269,7 +270,7 @@ struct hvcs_struct {
31025 unsigned int index;
31026
31027 struct tty_struct *tty;
31028- int open_count;
31029+ local_t open_count;
31030
31031 /*
31032 * Used to tell the driver kernel_thread what operations need to take
31033@@ -419,7 +420,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
31034
31035 spin_lock_irqsave(&hvcsd->lock, flags);
31036
31037- if (hvcsd->open_count > 0) {
31038+ if (local_read(&hvcsd->open_count) > 0) {
31039 spin_unlock_irqrestore(&hvcsd->lock, flags);
31040 printk(KERN_INFO "HVCS: vterm state unchanged. "
31041 "The hvcs device node is still in use.\n");
31042@@ -1135,7 +1136,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
31043 if ((retval = hvcs_partner_connect(hvcsd)))
31044 goto error_release;
31045
31046- hvcsd->open_count = 1;
31047+ local_set(&hvcsd->open_count, 1);
31048 hvcsd->tty = tty;
31049 tty->driver_data = hvcsd;
31050
31051@@ -1169,7 +1170,7 @@ fast_open:
31052
31053 spin_lock_irqsave(&hvcsd->lock, flags);
31054 kref_get(&hvcsd->kref);
31055- hvcsd->open_count++;
31056+ local_inc(&hvcsd->open_count);
31057 hvcsd->todo_mask |= HVCS_SCHED_READ;
31058 spin_unlock_irqrestore(&hvcsd->lock, flags);
31059
31060@@ -1213,7 +1214,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
31061 hvcsd = tty->driver_data;
31062
31063 spin_lock_irqsave(&hvcsd->lock, flags);
31064- if (--hvcsd->open_count == 0) {
31065+ if (local_dec_and_test(&hvcsd->open_count)) {
31066
31067 vio_disable_interrupts(hvcsd->vdev);
31068
31069@@ -1239,10 +1240,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
31070 free_irq(irq, hvcsd);
31071 kref_put(&hvcsd->kref, destroy_hvcs_struct);
31072 return;
31073- } else if (hvcsd->open_count < 0) {
31074+ } else if (local_read(&hvcsd->open_count) < 0) {
31075 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
31076 " is missmanaged.\n",
31077- hvcsd->vdev->unit_address, hvcsd->open_count);
31078+ hvcsd->vdev->unit_address, local_read(&hvcsd->open_count));
31079 }
31080
31081 spin_unlock_irqrestore(&hvcsd->lock, flags);
31082@@ -1258,7 +1259,7 @@ static void hvcs_hangup(struct tty_struct * tty)
31083
31084 spin_lock_irqsave(&hvcsd->lock, flags);
31085 /* Preserve this so that we know how many kref refs to put */
31086- temp_open_count = hvcsd->open_count;
31087+ temp_open_count = local_read(&hvcsd->open_count);
31088
31089 /*
31090 * Don't kref put inside the spinlock because the destruction
31091@@ -1273,7 +1274,7 @@ static void hvcs_hangup(struct tty_struct * tty)
31092 hvcsd->tty->driver_data = NULL;
31093 hvcsd->tty = NULL;
31094
31095- hvcsd->open_count = 0;
31096+ local_set(&hvcsd->open_count, 0);
31097
31098 /* This will drop any buffered data on the floor which is OK in a hangup
31099 * scenario. */
31100@@ -1344,7 +1345,7 @@ static int hvcs_write(struct tty_struct *tty,
31101 * the middle of a write operation? This is a crummy place to do this
31102 * but we want to keep it all in the spinlock.
31103 */
31104- if (hvcsd->open_count <= 0) {
31105+ if (local_read(&hvcsd->open_count) <= 0) {
31106 spin_unlock_irqrestore(&hvcsd->lock, flags);
31107 return -ENODEV;
31108 }
31109@@ -1418,7 +1419,7 @@ static int hvcs_write_room(struct tty_struct *tty)
31110 {
31111 struct hvcs_struct *hvcsd = tty->driver_data;
31112
31113- if (!hvcsd || hvcsd->open_count <= 0)
31114+ if (!hvcsd || local_read(&hvcsd->open_count) <= 0)
31115 return 0;
31116
31117 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
31118diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
31119index ec5e3f8..02455ba 100644
31120--- a/drivers/char/ipmi/ipmi_msghandler.c
31121+++ b/drivers/char/ipmi/ipmi_msghandler.c
31122@@ -414,7 +414,7 @@ struct ipmi_smi {
31123 struct proc_dir_entry *proc_dir;
31124 char proc_dir_name[10];
31125
31126- atomic_t stats[IPMI_NUM_STATS];
31127+ atomic_unchecked_t stats[IPMI_NUM_STATS];
31128
31129 /*
31130 * run_to_completion duplicate of smb_info, smi_info
31131@@ -447,9 +447,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
31132
31133
31134 #define ipmi_inc_stat(intf, stat) \
31135- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
31136+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
31137 #define ipmi_get_stat(intf, stat) \
31138- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
31139+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
31140
31141 static int is_lan_addr(struct ipmi_addr *addr)
31142 {
31143@@ -2808,7 +2808,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
31144 INIT_LIST_HEAD(&intf->cmd_rcvrs);
31145 init_waitqueue_head(&intf->waitq);
31146 for (i = 0; i < IPMI_NUM_STATS; i++)
31147- atomic_set(&intf->stats[i], 0);
31148+ atomic_set_unchecked(&intf->stats[i], 0);
31149
31150 intf->proc_dir = NULL;
31151
31152@@ -4160,6 +4160,8 @@ static void send_panic_events(char *str)
31153 struct ipmi_smi_msg smi_msg;
31154 struct ipmi_recv_msg recv_msg;
31155
31156+ pax_track_stack();
31157+
31158 si = (struct ipmi_system_interface_addr *) &addr;
31159 si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
31160 si->channel = IPMI_BMC_CHANNEL;
31161diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
31162index abae8c9..8021979 100644
31163--- a/drivers/char/ipmi/ipmi_si_intf.c
31164+++ b/drivers/char/ipmi/ipmi_si_intf.c
31165@@ -277,7 +277,7 @@ struct smi_info {
31166 unsigned char slave_addr;
31167
31168 /* Counters and things for the proc filesystem. */
31169- atomic_t stats[SI_NUM_STATS];
31170+ atomic_unchecked_t stats[SI_NUM_STATS];
31171
31172 struct task_struct *thread;
31173
31174@@ -285,9 +285,9 @@ struct smi_info {
31175 };
31176
31177 #define smi_inc_stat(smi, stat) \
31178- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
31179+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
31180 #define smi_get_stat(smi, stat) \
31181- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
31182+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
31183
31184 #define SI_MAX_PARMS 4
31185
31186@@ -2931,7 +2931,7 @@ static int try_smi_init(struct smi_info *new_smi)
31187 atomic_set(&new_smi->req_events, 0);
31188 new_smi->run_to_completion = 0;
31189 for (i = 0; i < SI_NUM_STATS; i++)
31190- atomic_set(&new_smi->stats[i], 0);
31191+ atomic_set_unchecked(&new_smi->stats[i], 0);
31192
31193 new_smi->interrupt_disabled = 0;
31194 atomic_set(&new_smi->stop_operation, 0);
31195diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
31196index 402838f..55e2200 100644
31197--- a/drivers/char/istallion.c
31198+++ b/drivers/char/istallion.c
31199@@ -187,7 +187,6 @@ static struct ktermios stli_deftermios = {
31200 * re-used for each stats call.
31201 */
31202 static comstats_t stli_comstats;
31203-static combrd_t stli_brdstats;
31204 static struct asystats stli_cdkstats;
31205
31206 /*****************************************************************************/
31207@@ -4058,6 +4057,7 @@ static int stli_getbrdstats(combrd_t __user *bp)
31208 {
31209 struct stlibrd *brdp;
31210 unsigned int i;
31211+ combrd_t stli_brdstats;
31212
31213 if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
31214 return -EFAULT;
31215@@ -4269,6 +4269,8 @@ static int stli_getportstruct(struct stliport __user *arg)
31216 struct stliport stli_dummyport;
31217 struct stliport *portp;
31218
31219+ pax_track_stack();
31220+
31221 if (copy_from_user(&stli_dummyport, arg, sizeof(struct stliport)))
31222 return -EFAULT;
31223 portp = stli_getport(stli_dummyport.brdnr, stli_dummyport.panelnr,
31224@@ -4291,6 +4293,8 @@ static int stli_getbrdstruct(struct stlibrd __user *arg)
31225 struct stlibrd stli_dummybrd;
31226 struct stlibrd *brdp;
31227
31228+ pax_track_stack();
31229+
31230 if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd)))
31231 return -EFAULT;
31232 if (stli_dummybrd.brdnr >= STL_MAXBRDS)
31233diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
31234index 950837c..e55a288 100644
31235--- a/drivers/char/keyboard.c
31236+++ b/drivers/char/keyboard.c
31237@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
31238 kbd->kbdmode == VC_MEDIUMRAW) &&
31239 value != KVAL(K_SAK))
31240 return; /* SAK is allowed even in raw mode */
31241+
31242+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
31243+ {
31244+ void *func = fn_handler[value];
31245+ if (func == fn_show_state || func == fn_show_ptregs ||
31246+ func == fn_show_mem)
31247+ return;
31248+ }
31249+#endif
31250+
31251 fn_handler[value](vc);
31252 }
31253
31254@@ -1386,7 +1396,7 @@ static const struct input_device_id kbd_ids[] = {
31255 .evbit = { BIT_MASK(EV_SND) },
31256 },
31257
31258- { }, /* Terminating entry */
31259+ { 0 }, /* Terminating entry */
31260 };
31261
31262 MODULE_DEVICE_TABLE(input, kbd_ids);
31263diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
31264index 87c67b4..230527a 100644
31265--- a/drivers/char/mbcs.c
31266+++ b/drivers/char/mbcs.c
31267@@ -799,7 +799,7 @@ static int mbcs_remove(struct cx_dev *dev)
31268 return 0;
31269 }
31270
31271-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
31272+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
31273 {
31274 .part_num = MBCS_PART_NUM,
31275 .mfg_num = MBCS_MFG_NUM,
31276diff --git a/drivers/char/mem.c b/drivers/char/mem.c
31277index 1270f64..8495f49 100644
31278--- a/drivers/char/mem.c
31279+++ b/drivers/char/mem.c
31280@@ -18,6 +18,7 @@
31281 #include <linux/raw.h>
31282 #include <linux/tty.h>
31283 #include <linux/capability.h>
31284+#include <linux/security.h>
31285 #include <linux/ptrace.h>
31286 #include <linux/device.h>
31287 #include <linux/highmem.h>
31288@@ -35,6 +36,10 @@
31289 # include <linux/efi.h>
31290 #endif
31291
31292+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
31293+extern struct file_operations grsec_fops;
31294+#endif
31295+
31296 static inline unsigned long size_inside_page(unsigned long start,
31297 unsigned long size)
31298 {
31299@@ -102,9 +107,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
31300
31301 while (cursor < to) {
31302 if (!devmem_is_allowed(pfn)) {
31303+#ifdef CONFIG_GRKERNSEC_KMEM
31304+ gr_handle_mem_readwrite(from, to);
31305+#else
31306 printk(KERN_INFO
31307 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
31308 current->comm, from, to);
31309+#endif
31310 return 0;
31311 }
31312 cursor += PAGE_SIZE;
31313@@ -112,6 +121,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
31314 }
31315 return 1;
31316 }
31317+#elif defined(CONFIG_GRKERNSEC_KMEM)
31318+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
31319+{
31320+ return 0;
31321+}
31322 #else
31323 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
31324 {
31325@@ -155,6 +169,8 @@ static ssize_t read_mem(struct file * file, char __user * buf,
31326 #endif
31327
31328 while (count > 0) {
31329+ char *temp;
31330+
31331 /*
31332 * Handle first page in case it's not aligned
31333 */
31334@@ -177,11 +193,31 @@ static ssize_t read_mem(struct file * file, char __user * buf,
31335 if (!ptr)
31336 return -EFAULT;
31337
31338- if (copy_to_user(buf, ptr, sz)) {
31339+#ifdef CONFIG_PAX_USERCOPY
31340+ temp = kmalloc(sz, GFP_KERNEL);
31341+ if (!temp) {
31342+ unxlate_dev_mem_ptr(p, ptr);
31343+ return -ENOMEM;
31344+ }
31345+ memcpy(temp, ptr, sz);
31346+#else
31347+ temp = ptr;
31348+#endif
31349+
31350+ if (copy_to_user(buf, temp, sz)) {
31351+
31352+#ifdef CONFIG_PAX_USERCOPY
31353+ kfree(temp);
31354+#endif
31355+
31356 unxlate_dev_mem_ptr(p, ptr);
31357 return -EFAULT;
31358 }
31359
31360+#ifdef CONFIG_PAX_USERCOPY
31361+ kfree(temp);
31362+#endif
31363+
31364 unxlate_dev_mem_ptr(p, ptr);
31365
31366 buf += sz;
31367@@ -419,9 +455,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
31368 size_t count, loff_t *ppos)
31369 {
31370 unsigned long p = *ppos;
31371- ssize_t low_count, read, sz;
31372+ ssize_t low_count, read, sz, err = 0;
31373 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
31374- int err = 0;
31375
31376 read = 0;
31377 if (p < (unsigned long) high_memory) {
31378@@ -444,6 +479,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
31379 }
31380 #endif
31381 while (low_count > 0) {
31382+ char *temp;
31383+
31384 sz = size_inside_page(p, low_count);
31385
31386 /*
31387@@ -453,7 +490,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
31388 */
31389 kbuf = xlate_dev_kmem_ptr((char *)p);
31390
31391- if (copy_to_user(buf, kbuf, sz))
31392+#ifdef CONFIG_PAX_USERCOPY
31393+ temp = kmalloc(sz, GFP_KERNEL);
31394+ if (!temp)
31395+ return -ENOMEM;
31396+ memcpy(temp, kbuf, sz);
31397+#else
31398+ temp = kbuf;
31399+#endif
31400+
31401+ err = copy_to_user(buf, temp, sz);
31402+
31403+#ifdef CONFIG_PAX_USERCOPY
31404+ kfree(temp);
31405+#endif
31406+
31407+ if (err)
31408 return -EFAULT;
31409 buf += sz;
31410 p += sz;
31411@@ -889,6 +941,9 @@ static const struct memdev {
31412 #ifdef CONFIG_CRASH_DUMP
31413 [12] = { "oldmem", 0, &oldmem_fops, NULL },
31414 #endif
31415+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
31416+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
31417+#endif
31418 };
31419
31420 static int memory_open(struct inode *inode, struct file *filp)
31421diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
31422index 674b3ab..a8d1970 100644
31423--- a/drivers/char/pcmcia/ipwireless/tty.c
31424+++ b/drivers/char/pcmcia/ipwireless/tty.c
31425@@ -29,6 +29,7 @@
31426 #include <linux/tty_driver.h>
31427 #include <linux/tty_flip.h>
31428 #include <linux/uaccess.h>
31429+#include <asm/local.h>
31430
31431 #include "tty.h"
31432 #include "network.h"
31433@@ -51,7 +52,7 @@ struct ipw_tty {
31434 int tty_type;
31435 struct ipw_network *network;
31436 struct tty_struct *linux_tty;
31437- int open_count;
31438+ local_t open_count;
31439 unsigned int control_lines;
31440 struct mutex ipw_tty_mutex;
31441 int tx_bytes_queued;
31442@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
31443 mutex_unlock(&tty->ipw_tty_mutex);
31444 return -ENODEV;
31445 }
31446- if (tty->open_count == 0)
31447+ if (local_read(&tty->open_count) == 0)
31448 tty->tx_bytes_queued = 0;
31449
31450- tty->open_count++;
31451+ local_inc(&tty->open_count);
31452
31453 tty->linux_tty = linux_tty;
31454 linux_tty->driver_data = tty;
31455@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
31456
31457 static void do_ipw_close(struct ipw_tty *tty)
31458 {
31459- tty->open_count--;
31460-
31461- if (tty->open_count == 0) {
31462+ if (local_dec_return(&tty->open_count) == 0) {
31463 struct tty_struct *linux_tty = tty->linux_tty;
31464
31465 if (linux_tty != NULL) {
31466@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
31467 return;
31468
31469 mutex_lock(&tty->ipw_tty_mutex);
31470- if (tty->open_count == 0) {
31471+ if (local_read(&tty->open_count) == 0) {
31472 mutex_unlock(&tty->ipw_tty_mutex);
31473 return;
31474 }
31475@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
31476 return;
31477 }
31478
31479- if (!tty->open_count) {
31480+ if (!local_read(&tty->open_count)) {
31481 mutex_unlock(&tty->ipw_tty_mutex);
31482 return;
31483 }
31484@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *linux_tty,
31485 return -ENODEV;
31486
31487 mutex_lock(&tty->ipw_tty_mutex);
31488- if (!tty->open_count) {
31489+ if (!local_read(&tty->open_count)) {
31490 mutex_unlock(&tty->ipw_tty_mutex);
31491 return -EINVAL;
31492 }
31493@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
31494 if (!tty)
31495 return -ENODEV;
31496
31497- if (!tty->open_count)
31498+ if (!local_read(&tty->open_count))
31499 return -EINVAL;
31500
31501 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
31502@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
31503 if (!tty)
31504 return 0;
31505
31506- if (!tty->open_count)
31507+ if (!local_read(&tty->open_count))
31508 return 0;
31509
31510 return tty->tx_bytes_queued;
31511@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty, struct file *file)
31512 if (!tty)
31513 return -ENODEV;
31514
31515- if (!tty->open_count)
31516+ if (!local_read(&tty->open_count))
31517 return -EINVAL;
31518
31519 return get_control_lines(tty);
31520@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty, struct file *file,
31521 if (!tty)
31522 return -ENODEV;
31523
31524- if (!tty->open_count)
31525+ if (!local_read(&tty->open_count))
31526 return -EINVAL;
31527
31528 return set_control_lines(tty, set, clear);
31529@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,
31530 if (!tty)
31531 return -ENODEV;
31532
31533- if (!tty->open_count)
31534+ if (!local_read(&tty->open_count))
31535 return -EINVAL;
31536
31537 /* FIXME: Exactly how is the tty object locked here .. */
31538@@ -591,7 +590,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
31539 against a parallel ioctl etc */
31540 mutex_lock(&ttyj->ipw_tty_mutex);
31541 }
31542- while (ttyj->open_count)
31543+ while (local_read(&ttyj->open_count))
31544 do_ipw_close(ttyj);
31545 ipwireless_disassociate_network_ttys(network,
31546 ttyj->channel_idx);
31547diff --git a/drivers/char/pty.c b/drivers/char/pty.c
31548index 62f282e..e45c45c 100644
31549--- a/drivers/char/pty.c
31550+++ b/drivers/char/pty.c
31551@@ -736,8 +736,10 @@ static void __init unix98_pty_init(void)
31552 register_sysctl_table(pty_root_table);
31553
31554 /* Now create the /dev/ptmx special device */
31555+ pax_open_kernel();
31556 tty_default_fops(&ptmx_fops);
31557- ptmx_fops.open = ptmx_open;
31558+ *(void **)&ptmx_fops.open = ptmx_open;
31559+ pax_close_kernel();
31560
31561 cdev_init(&ptmx_cdev, &ptmx_fops);
31562 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
31563diff --git a/drivers/char/random.c b/drivers/char/random.c
31564index 3a19e2d..6ed09d3 100644
31565--- a/drivers/char/random.c
31566+++ b/drivers/char/random.c
31567@@ -254,8 +254,13 @@
31568 /*
31569 * Configuration information
31570 */
31571+#ifdef CONFIG_GRKERNSEC_RANDNET
31572+#define INPUT_POOL_WORDS 512
31573+#define OUTPUT_POOL_WORDS 128
31574+#else
31575 #define INPUT_POOL_WORDS 128
31576 #define OUTPUT_POOL_WORDS 32
31577+#endif
31578 #define SEC_XFER_SIZE 512
31579
31580 /*
31581@@ -292,10 +297,17 @@ static struct poolinfo {
31582 int poolwords;
31583 int tap1, tap2, tap3, tap4, tap5;
31584 } poolinfo_table[] = {
31585+#ifdef CONFIG_GRKERNSEC_RANDNET
31586+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
31587+ { 512, 411, 308, 208, 104, 1 },
31588+ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
31589+ { 128, 103, 76, 51, 25, 1 },
31590+#else
31591 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
31592 { 128, 103, 76, 51, 25, 1 },
31593 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
31594 { 32, 26, 20, 14, 7, 1 },
31595+#endif
31596 #if 0
31597 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
31598 { 2048, 1638, 1231, 819, 411, 1 },
31599@@ -1209,7 +1221,7 @@ EXPORT_SYMBOL(generate_random_uuid);
31600 #include <linux/sysctl.h>
31601
31602 static int min_read_thresh = 8, min_write_thresh;
31603-static int max_read_thresh = INPUT_POOL_WORDS * 32;
31604+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
31605 static int max_write_thresh = INPUT_POOL_WORDS * 32;
31606 static char sysctl_bootid[16];
31607
31608diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
31609index 0e29a23..0efc2c2 100644
31610--- a/drivers/char/rocket.c
31611+++ b/drivers/char/rocket.c
31612@@ -1266,6 +1266,8 @@ static int get_ports(struct r_port *info, struct rocket_ports __user *retports)
31613 struct rocket_ports tmp;
31614 int board;
31615
31616+ pax_track_stack();
31617+
31618 if (!retports)
31619 return -EFAULT;
31620 memset(&tmp, 0, sizeof (tmp));
31621diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
31622index 8c262aa..4d3b058 100644
31623--- a/drivers/char/sonypi.c
31624+++ b/drivers/char/sonypi.c
31625@@ -55,6 +55,7 @@
31626 #include <asm/uaccess.h>
31627 #include <asm/io.h>
31628 #include <asm/system.h>
31629+#include <asm/local.h>
31630
31631 #include <linux/sonypi.h>
31632
31633@@ -491,7 +492,7 @@ static struct sonypi_device {
31634 spinlock_t fifo_lock;
31635 wait_queue_head_t fifo_proc_list;
31636 struct fasync_struct *fifo_async;
31637- int open_count;
31638+ local_t open_count;
31639 int model;
31640 struct input_dev *input_jog_dev;
31641 struct input_dev *input_key_dev;
31642@@ -895,7 +896,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
31643 static int sonypi_misc_release(struct inode *inode, struct file *file)
31644 {
31645 mutex_lock(&sonypi_device.lock);
31646- sonypi_device.open_count--;
31647+ local_dec(&sonypi_device.open_count);
31648 mutex_unlock(&sonypi_device.lock);
31649 return 0;
31650 }
31651@@ -905,9 +906,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
31652 lock_kernel();
31653 mutex_lock(&sonypi_device.lock);
31654 /* Flush input queue on first open */
31655- if (!sonypi_device.open_count)
31656+ if (!local_read(&sonypi_device.open_count))
31657 kfifo_reset(sonypi_device.fifo);
31658- sonypi_device.open_count++;
31659+ local_inc(&sonypi_device.open_count);
31660 mutex_unlock(&sonypi_device.lock);
31661 unlock_kernel();
31662 return 0;
31663diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
31664index db6dcfa..13834cb 100644
31665--- a/drivers/char/stallion.c
31666+++ b/drivers/char/stallion.c
31667@@ -2448,6 +2448,8 @@ static int stl_getportstruct(struct stlport __user *arg)
31668 struct stlport stl_dummyport;
31669 struct stlport *portp;
31670
31671+ pax_track_stack();
31672+
31673 if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
31674 return -EFAULT;
31675 portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
31676diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
31677index a0789f6..cea3902 100644
31678--- a/drivers/char/tpm/tpm.c
31679+++ b/drivers/char/tpm/tpm.c
31680@@ -405,7 +405,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
31681 chip->vendor.req_complete_val)
31682 goto out_recv;
31683
31684- if ((status == chip->vendor.req_canceled)) {
31685+ if (status == chip->vendor.req_canceled) {
31686 dev_err(chip->dev, "Operation Canceled\n");
31687 rc = -ECANCELED;
31688 goto out;
31689@@ -824,6 +824,8 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
31690
31691 struct tpm_chip *chip = dev_get_drvdata(dev);
31692
31693+ pax_track_stack();
31694+
31695 tpm_cmd.header.in = tpm_readpubek_header;
31696 err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
31697 "attempting to read the PUBEK");
31698diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
31699index bf2170f..ce8cab9 100644
31700--- a/drivers/char/tpm/tpm_bios.c
31701+++ b/drivers/char/tpm/tpm_bios.c
31702@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
31703 event = addr;
31704
31705 if ((event->event_type == 0 && event->event_size == 0) ||
31706- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
31707+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
31708 return NULL;
31709
31710 return addr;
31711@@ -197,7 +197,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
31712 return NULL;
31713
31714 if ((event->event_type == 0 && event->event_size == 0) ||
31715- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
31716+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
31717 return NULL;
31718
31719 (*pos)++;
31720@@ -290,7 +290,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
31721 int i;
31722
31723 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
31724- seq_putc(m, data[i]);
31725+ if (!seq_putc(m, data[i]))
31726+ return -EFAULT;
31727
31728 return 0;
31729 }
31730@@ -409,8 +410,13 @@ static int read_log(struct tpm_bios_log *log)
31731 log->bios_event_log_end = log->bios_event_log + len;
31732
31733 virt = acpi_os_map_memory(start, len);
31734+ if (!virt) {
31735+ kfree(log->bios_event_log);
31736+ log->bios_event_log = NULL;
31737+ return -EFAULT;
31738+ }
31739
31740- memcpy(log->bios_event_log, virt, len);
31741+ memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
31742
31743 acpi_os_unmap_memory(virt, len);
31744 return 0;
31745diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
31746index 123cedf..6664cb4 100644
31747--- a/drivers/char/tty_io.c
31748+++ b/drivers/char/tty_io.c
31749@@ -146,7 +146,7 @@ static int tty_open(struct inode *, struct file *);
31750 static int tty_release(struct inode *, struct file *);
31751 long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
31752 #ifdef CONFIG_COMPAT
31753-static long tty_compat_ioctl(struct file *file, unsigned int cmd,
31754+long tty_compat_ioctl(struct file *file, unsigned int cmd,
31755 unsigned long arg);
31756 #else
31757 #define tty_compat_ioctl NULL
31758@@ -1774,6 +1774,7 @@ got_driver:
31759
31760 if (IS_ERR(tty)) {
31761 mutex_unlock(&tty_mutex);
31762+ tty_driver_kref_put(driver);
31763 return PTR_ERR(tty);
31764 }
31765 }
31766@@ -2603,8 +2604,10 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
31767 return retval;
31768 }
31769
31770+EXPORT_SYMBOL(tty_ioctl);
31771+
31772 #ifdef CONFIG_COMPAT
31773-static long tty_compat_ioctl(struct file *file, unsigned int cmd,
31774+long tty_compat_ioctl(struct file *file, unsigned int cmd,
31775 unsigned long arg)
31776 {
31777 struct inode *inode = file->f_dentry->d_inode;
31778@@ -2628,6 +2631,8 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
31779
31780 return retval;
31781 }
31782+
31783+EXPORT_SYMBOL(tty_compat_ioctl);
31784 #endif
31785
31786 /*
31787@@ -3073,7 +3078,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
31788
31789 void tty_default_fops(struct file_operations *fops)
31790 {
31791- *fops = tty_fops;
31792+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
31793 }
31794
31795 /*
31796diff --git a/drivers/char/tty_ldisc.c b/drivers/char/tty_ldisc.c
31797index d814a3d..b55b9c9 100644
31798--- a/drivers/char/tty_ldisc.c
31799+++ b/drivers/char/tty_ldisc.c
31800@@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *ld)
31801 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
31802 struct tty_ldisc_ops *ldo = ld->ops;
31803
31804- ldo->refcount--;
31805+ atomic_dec(&ldo->refcount);
31806 module_put(ldo->owner);
31807 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
31808
31809@@ -109,7 +109,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
31810 spin_lock_irqsave(&tty_ldisc_lock, flags);
31811 tty_ldiscs[disc] = new_ldisc;
31812 new_ldisc->num = disc;
31813- new_ldisc->refcount = 0;
31814+ atomic_set(&new_ldisc->refcount, 0);
31815 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
31816
31817 return ret;
31818@@ -137,7 +137,7 @@ int tty_unregister_ldisc(int disc)
31819 return -EINVAL;
31820
31821 spin_lock_irqsave(&tty_ldisc_lock, flags);
31822- if (tty_ldiscs[disc]->refcount)
31823+ if (atomic_read(&tty_ldiscs[disc]->refcount))
31824 ret = -EBUSY;
31825 else
31826 tty_ldiscs[disc] = NULL;
31827@@ -158,7 +158,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
31828 if (ldops) {
31829 ret = ERR_PTR(-EAGAIN);
31830 if (try_module_get(ldops->owner)) {
31831- ldops->refcount++;
31832+ atomic_inc(&ldops->refcount);
31833 ret = ldops;
31834 }
31835 }
31836@@ -171,7 +171,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
31837 unsigned long flags;
31838
31839 spin_lock_irqsave(&tty_ldisc_lock, flags);
31840- ldops->refcount--;
31841+ atomic_dec(&ldops->refcount);
31842 module_put(ldops->owner);
31843 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
31844 }
31845diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
31846index a035ae3..c27fe2c 100644
31847--- a/drivers/char/virtio_console.c
31848+++ b/drivers/char/virtio_console.c
31849@@ -133,7 +133,9 @@ static int get_chars(u32 vtermno, char *buf, int count)
31850 * virtqueue, so we let the drivers do some boutique early-output thing. */
31851 int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int))
31852 {
31853- virtio_cons.put_chars = put_chars;
31854+ pax_open_kernel();
31855+ *(void **)&virtio_cons.put_chars = put_chars;
31856+ pax_close_kernel();
31857 return hvc_instantiate(0, 0, &virtio_cons);
31858 }
31859
31860@@ -213,11 +215,13 @@ static int __devinit virtcons_probe(struct virtio_device *dev)
31861 out_vq = vqs[1];
31862
31863 /* Start using the new console output. */
31864- virtio_cons.get_chars = get_chars;
31865- virtio_cons.put_chars = put_chars;
31866- virtio_cons.notifier_add = notifier_add_vio;
31867- virtio_cons.notifier_del = notifier_del_vio;
31868- virtio_cons.notifier_hangup = notifier_del_vio;
31869+ pax_open_kernel();
31870+ *(void **)&virtio_cons.get_chars = get_chars;
31871+ *(void **)&virtio_cons.put_chars = put_chars;
31872+ *(void **)&virtio_cons.notifier_add = notifier_add_vio;
31873+ *(void **)&virtio_cons.notifier_del = notifier_del_vio;
31874+ *(void **)&virtio_cons.notifier_hangup = notifier_del_vio;
31875+ pax_close_kernel();
31876
31877 /* The first argument of hvc_alloc() is the virtual console number, so
31878 * we use zero. The second argument is the parameter for the
31879diff --git a/drivers/char/vt.c b/drivers/char/vt.c
31880index 0c80c68..53d59c1 100644
31881--- a/drivers/char/vt.c
31882+++ b/drivers/char/vt.c
31883@@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier);
31884
31885 static void notify_write(struct vc_data *vc, unsigned int unicode)
31886 {
31887- struct vt_notifier_param param = { .vc = vc, unicode = unicode };
31888+ struct vt_notifier_param param = { .vc = vc, .c = unicode };
31889 atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
31890 }
31891
31892diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
31893index 6351a26..999af95 100644
31894--- a/drivers/char/vt_ioctl.c
31895+++ b/drivers/char/vt_ioctl.c
31896@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
31897 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
31898 return -EFAULT;
31899
31900- if (!capable(CAP_SYS_TTY_CONFIG))
31901- perm = 0;
31902-
31903 switch (cmd) {
31904 case KDGKBENT:
31905 key_map = key_maps[s];
31906@@ -224,8 +221,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
31907 val = (i ? K_HOLE : K_NOSUCHMAP);
31908 return put_user(val, &user_kbe->kb_value);
31909 case KDSKBENT:
31910+ if (!capable(CAP_SYS_TTY_CONFIG))
31911+ perm = 0;
31912+
31913 if (!perm)
31914 return -EPERM;
31915+
31916 if (!i && v == K_NOSUCHMAP) {
31917 /* deallocate map */
31918 key_map = key_maps[s];
31919@@ -325,9 +326,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
31920 int i, j, k;
31921 int ret;
31922
31923- if (!capable(CAP_SYS_TTY_CONFIG))
31924- perm = 0;
31925-
31926 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
31927 if (!kbs) {
31928 ret = -ENOMEM;
31929@@ -361,6 +359,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
31930 kfree(kbs);
31931 return ((p && *p) ? -EOVERFLOW : 0);
31932 case KDSKBSENT:
31933+ if (!capable(CAP_SYS_TTY_CONFIG))
31934+ perm = 0;
31935+
31936 if (!perm) {
31937 ret = -EPERM;
31938 goto reterr;
31939diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
31940index c7ae026..1769c1d 100644
31941--- a/drivers/cpufreq/cpufreq.c
31942+++ b/drivers/cpufreq/cpufreq.c
31943@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct kobject *kobj)
31944 complete(&policy->kobj_unregister);
31945 }
31946
31947-static struct sysfs_ops sysfs_ops = {
31948+static const struct sysfs_ops sysfs_ops = {
31949 .show = show,
31950 .store = store,
31951 };
31952diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
31953index 97b0038..2056670 100644
31954--- a/drivers/cpuidle/sysfs.c
31955+++ b/drivers/cpuidle/sysfs.c
31956@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobject * kobj, struct attribute * attr,
31957 return ret;
31958 }
31959
31960-static struct sysfs_ops cpuidle_sysfs_ops = {
31961+static const struct sysfs_ops cpuidle_sysfs_ops = {
31962 .show = cpuidle_show,
31963 .store = cpuidle_store,
31964 };
31965@@ -277,7 +277,7 @@ static ssize_t cpuidle_state_show(struct kobject * kobj,
31966 return ret;
31967 }
31968
31969-static struct sysfs_ops cpuidle_state_sysfs_ops = {
31970+static const struct sysfs_ops cpuidle_state_sysfs_ops = {
31971 .show = cpuidle_state_show,
31972 };
31973
31974@@ -294,7 +294,7 @@ static struct kobj_type ktype_state_cpuidle = {
31975 .release = cpuidle_state_sysfs_release,
31976 };
31977
31978-static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
31979+static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
31980 {
31981 kobject_put(&device->kobjs[i]->kobj);
31982 wait_for_completion(&device->kobjs[i]->kobj_unregister);
31983diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
31984index 5f753fc..0377ae9 100644
31985--- a/drivers/crypto/hifn_795x.c
31986+++ b/drivers/crypto/hifn_795x.c
31987@@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device *dev, int encdec, u8 snum)
31988 0xCA, 0x34, 0x2B, 0x2E};
31989 struct scatterlist sg;
31990
31991+ pax_track_stack();
31992+
31993 memset(src, 0, sizeof(src));
31994 memset(ctx.key, 0, sizeof(ctx.key));
31995
31996diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
31997index 71e6482..de8d96c 100644
31998--- a/drivers/crypto/padlock-aes.c
31999+++ b/drivers/crypto/padlock-aes.c
32000@@ -108,6 +108,8 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
32001 struct crypto_aes_ctx gen_aes;
32002 int cpu;
32003
32004+ pax_track_stack();
32005+
32006 if (key_len % 8) {
32007 *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
32008 return -EINVAL;
32009diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
32010index dcc4ab7..cc834bb 100644
32011--- a/drivers/dma/ioat/dma.c
32012+++ b/drivers/dma/ioat/dma.c
32013@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
32014 return entry->show(&chan->common, page);
32015 }
32016
32017-struct sysfs_ops ioat_sysfs_ops = {
32018+const struct sysfs_ops ioat_sysfs_ops = {
32019 .show = ioat_attr_show,
32020 };
32021
32022diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
32023index bbc3e78..f2db62c 100644
32024--- a/drivers/dma/ioat/dma.h
32025+++ b/drivers/dma/ioat/dma.h
32026@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_chan_common *chan,
32027 unsigned long *phys_complete);
32028 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
32029 void ioat_kobject_del(struct ioatdma_device *device);
32030-extern struct sysfs_ops ioat_sysfs_ops;
32031+extern const struct sysfs_ops ioat_sysfs_ops;
32032 extern struct ioat_sysfs_entry ioat_version_attr;
32033 extern struct ioat_sysfs_entry ioat_cap_attr;
32034 #endif /* IOATDMA_H */
32035diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
32036index 9908c9e..3ceb0e5 100644
32037--- a/drivers/dma/ioat/dma_v3.c
32038+++ b/drivers/dma/ioat/dma_v3.c
32039@@ -71,10 +71,10 @@
32040 /* provide a lookup table for setting the source address in the base or
32041 * extended descriptor of an xor or pq descriptor
32042 */
32043-static const u8 xor_idx_to_desc __read_mostly = 0xd0;
32044-static const u8 xor_idx_to_field[] __read_mostly = { 1, 4, 5, 6, 7, 0, 1, 2 };
32045-static const u8 pq_idx_to_desc __read_mostly = 0xf8;
32046-static const u8 pq_idx_to_field[] __read_mostly = { 1, 4, 5, 0, 1, 2, 4, 5 };
32047+static const u8 xor_idx_to_desc = 0xd0;
32048+static const u8 xor_idx_to_field[] = { 1, 4, 5, 6, 7, 0, 1, 2 };
32049+static const u8 pq_idx_to_desc = 0xf8;
32050+static const u8 pq_idx_to_field[] = { 1, 4, 5, 0, 1, 2, 4, 5 };
32051
32052 static dma_addr_t xor_get_src(struct ioat_raw_descriptor *descs[2], int idx)
32053 {
32054diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
32055index 85c464a..afd1e73 100644
32056--- a/drivers/edac/amd64_edac.c
32057+++ b/drivers/edac/amd64_edac.c
32058@@ -3099,7 +3099,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
32059 * PCI core identifies what devices are on a system during boot, and then
32060 * inquiry this table to see if this driver is for a given device found.
32061 */
32062-static const struct pci_device_id amd64_pci_table[] __devinitdata = {
32063+static const struct pci_device_id amd64_pci_table[] __devinitconst = {
32064 {
32065 .vendor = PCI_VENDOR_ID_AMD,
32066 .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
32067diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
32068index 2b95f1a..4f52793 100644
32069--- a/drivers/edac/amd76x_edac.c
32070+++ b/drivers/edac/amd76x_edac.c
32071@@ -322,7 +322,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
32072 edac_mc_free(mci);
32073 }
32074
32075-static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
32076+static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
32077 {
32078 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32079 AMD762},
32080diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
32081index d205d49..74c9672 100644
32082--- a/drivers/edac/e752x_edac.c
32083+++ b/drivers/edac/e752x_edac.c
32084@@ -1282,7 +1282,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
32085 edac_mc_free(mci);
32086 }
32087
32088-static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
32089+static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
32090 {
32091 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32092 E7520},
32093diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
32094index c7d11cc..c59c1ca 100644
32095--- a/drivers/edac/e7xxx_edac.c
32096+++ b/drivers/edac/e7xxx_edac.c
32097@@ -526,7 +526,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
32098 edac_mc_free(mci);
32099 }
32100
32101-static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
32102+static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
32103 {
32104 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32105 E7205},
32106diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c
32107index 5376457..5fdedbc 100644
32108--- a/drivers/edac/edac_device_sysfs.c
32109+++ b/drivers/edac/edac_device_sysfs.c
32110@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(struct kobject *kobj,
32111 }
32112
32113 /* edac_dev file operations for an 'ctl_info' */
32114-static struct sysfs_ops device_ctl_info_ops = {
32115+static const struct sysfs_ops device_ctl_info_ops = {
32116 .show = edac_dev_ctl_info_show,
32117 .store = edac_dev_ctl_info_store
32118 };
32119@@ -373,7 +373,7 @@ static ssize_t edac_dev_instance_store(struct kobject *kobj,
32120 }
32121
32122 /* edac_dev file operations for an 'instance' */
32123-static struct sysfs_ops device_instance_ops = {
32124+static const struct sysfs_ops device_instance_ops = {
32125 .show = edac_dev_instance_show,
32126 .store = edac_dev_instance_store
32127 };
32128@@ -476,7 +476,7 @@ static ssize_t edac_dev_block_store(struct kobject *kobj,
32129 }
32130
32131 /* edac_dev file operations for a 'block' */
32132-static struct sysfs_ops device_block_ops = {
32133+static const struct sysfs_ops device_block_ops = {
32134 .show = edac_dev_block_show,
32135 .store = edac_dev_block_store
32136 };
32137diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
32138index e1d4ce0..88840e9 100644
32139--- a/drivers/edac/edac_mc_sysfs.c
32140+++ b/drivers/edac/edac_mc_sysfs.c
32141@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kobject *kobj, struct attribute *attr,
32142 return -EIO;
32143 }
32144
32145-static struct sysfs_ops csrowfs_ops = {
32146+static const struct sysfs_ops csrowfs_ops = {
32147 .show = csrowdev_show,
32148 .store = csrowdev_store
32149 };
32150@@ -575,7 +575,7 @@ static ssize_t mcidev_store(struct kobject *kobj, struct attribute *attr,
32151 }
32152
32153 /* Intermediate show/store table */
32154-static struct sysfs_ops mci_ops = {
32155+static const struct sysfs_ops mci_ops = {
32156 .show = mcidev_show,
32157 .store = mcidev_store
32158 };
32159diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
32160index 422728c..d8d9c88 100644
32161--- a/drivers/edac/edac_pci_sysfs.c
32162+++ b/drivers/edac/edac_pci_sysfs.c
32163@@ -25,8 +25,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
32164 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
32165 static int edac_pci_poll_msec = 1000; /* one second workq period */
32166
32167-static atomic_t pci_parity_count = ATOMIC_INIT(0);
32168-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
32169+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
32170+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
32171
32172 static struct kobject *edac_pci_top_main_kobj;
32173 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
32174@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(struct kobject *kobj,
32175 }
32176
32177 /* fs_ops table */
32178-static struct sysfs_ops pci_instance_ops = {
32179+static const struct sysfs_ops pci_instance_ops = {
32180 .show = edac_pci_instance_show,
32181 .store = edac_pci_instance_store
32182 };
32183@@ -261,7 +261,7 @@ static ssize_t edac_pci_dev_store(struct kobject *kobj,
32184 return -EIO;
32185 }
32186
32187-static struct sysfs_ops edac_pci_sysfs_ops = {
32188+static const struct sysfs_ops edac_pci_sysfs_ops = {
32189 .show = edac_pci_dev_show,
32190 .store = edac_pci_dev_store
32191 };
32192@@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32193 edac_printk(KERN_CRIT, EDAC_PCI,
32194 "Signaled System Error on %s\n",
32195 pci_name(dev));
32196- atomic_inc(&pci_nonparity_count);
32197+ atomic_inc_unchecked(&pci_nonparity_count);
32198 }
32199
32200 if (status & (PCI_STATUS_PARITY)) {
32201@@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32202 "Master Data Parity Error on %s\n",
32203 pci_name(dev));
32204
32205- atomic_inc(&pci_parity_count);
32206+ atomic_inc_unchecked(&pci_parity_count);
32207 }
32208
32209 if (status & (PCI_STATUS_DETECTED_PARITY)) {
32210@@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32211 "Detected Parity Error on %s\n",
32212 pci_name(dev));
32213
32214- atomic_inc(&pci_parity_count);
32215+ atomic_inc_unchecked(&pci_parity_count);
32216 }
32217 }
32218
32219@@ -616,7 +616,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32220 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
32221 "Signaled System Error on %s\n",
32222 pci_name(dev));
32223- atomic_inc(&pci_nonparity_count);
32224+ atomic_inc_unchecked(&pci_nonparity_count);
32225 }
32226
32227 if (status & (PCI_STATUS_PARITY)) {
32228@@ -624,7 +624,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32229 "Master Data Parity Error on "
32230 "%s\n", pci_name(dev));
32231
32232- atomic_inc(&pci_parity_count);
32233+ atomic_inc_unchecked(&pci_parity_count);
32234 }
32235
32236 if (status & (PCI_STATUS_DETECTED_PARITY)) {
32237@@ -632,7 +632,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32238 "Detected Parity Error on %s\n",
32239 pci_name(dev));
32240
32241- atomic_inc(&pci_parity_count);
32242+ atomic_inc_unchecked(&pci_parity_count);
32243 }
32244 }
32245 }
32246@@ -674,7 +674,7 @@ void edac_pci_do_parity_check(void)
32247 if (!check_pci_errors)
32248 return;
32249
32250- before_count = atomic_read(&pci_parity_count);
32251+ before_count = atomic_read_unchecked(&pci_parity_count);
32252
32253 /* scan all PCI devices looking for a Parity Error on devices and
32254 * bridges.
32255@@ -686,7 +686,7 @@ void edac_pci_do_parity_check(void)
32256 /* Only if operator has selected panic on PCI Error */
32257 if (edac_pci_get_panic_on_pe()) {
32258 /* If the count is different 'after' from 'before' */
32259- if (before_count != atomic_read(&pci_parity_count))
32260+ if (before_count != atomic_read_unchecked(&pci_parity_count))
32261 panic("EDAC: PCI Parity Error");
32262 }
32263 }
32264diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
32265index 6c9a0f2..9c1cf7e 100644
32266--- a/drivers/edac/i3000_edac.c
32267+++ b/drivers/edac/i3000_edac.c
32268@@ -471,7 +471,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
32269 edac_mc_free(mci);
32270 }
32271
32272-static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
32273+static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
32274 {
32275 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32276 I3000},
32277diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
32278index fde4db9..fe108f9 100644
32279--- a/drivers/edac/i3200_edac.c
32280+++ b/drivers/edac/i3200_edac.c
32281@@ -444,7 +444,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev)
32282 edac_mc_free(mci);
32283 }
32284
32285-static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
32286+static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
32287 {
32288 PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32289 I3200},
32290diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
32291index adc10a2..57d4ccf 100644
32292--- a/drivers/edac/i5000_edac.c
32293+++ b/drivers/edac/i5000_edac.c
32294@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
32295 *
32296 * The "E500P" device is the first device supported.
32297 */
32298-static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
32299+static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
32300 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
32301 .driver_data = I5000P},
32302
32303diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
32304index 22db05a..b2b5503 100644
32305--- a/drivers/edac/i5100_edac.c
32306+++ b/drivers/edac/i5100_edac.c
32307@@ -944,7 +944,7 @@ static void __devexit i5100_remove_one(struct pci_dev *pdev)
32308 edac_mc_free(mci);
32309 }
32310
32311-static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
32312+static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
32313 /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
32314 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
32315 { 0, }
32316diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
32317index f99d106..f050710 100644
32318--- a/drivers/edac/i5400_edac.c
32319+++ b/drivers/edac/i5400_edac.c
32320@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
32321 *
32322 * The "E500P" device is the first device supported.
32323 */
32324-static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
32325+static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
32326 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
32327 {0,} /* 0 terminated list. */
32328 };
32329diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
32330index 577760a..9ce16ce 100644
32331--- a/drivers/edac/i82443bxgx_edac.c
32332+++ b/drivers/edac/i82443bxgx_edac.c
32333@@ -381,7 +381,7 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
32334
32335 EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
32336
32337-static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
32338+static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
32339 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
32340 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
32341 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
32342diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
32343index c0088ba..64a7b98 100644
32344--- a/drivers/edac/i82860_edac.c
32345+++ b/drivers/edac/i82860_edac.c
32346@@ -271,7 +271,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
32347 edac_mc_free(mci);
32348 }
32349
32350-static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
32351+static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
32352 {
32353 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32354 I82860},
32355diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
32356index b2d83b9..a34357b 100644
32357--- a/drivers/edac/i82875p_edac.c
32358+++ b/drivers/edac/i82875p_edac.c
32359@@ -512,7 +512,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
32360 edac_mc_free(mci);
32361 }
32362
32363-static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
32364+static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
32365 {
32366 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32367 I82875P},
32368diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
32369index 2eed3ea..87bbbd1 100644
32370--- a/drivers/edac/i82975x_edac.c
32371+++ b/drivers/edac/i82975x_edac.c
32372@@ -586,7 +586,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
32373 edac_mc_free(mci);
32374 }
32375
32376-static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
32377+static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
32378 {
32379 PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32380 I82975X
32381diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
32382index 9900675..78ac2b6 100644
32383--- a/drivers/edac/r82600_edac.c
32384+++ b/drivers/edac/r82600_edac.c
32385@@ -374,7 +374,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
32386 edac_mc_free(mci);
32387 }
32388
32389-static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
32390+static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
32391 {
32392 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
32393 },
32394diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
32395index d4ec605..4cfec4e 100644
32396--- a/drivers/edac/x38_edac.c
32397+++ b/drivers/edac/x38_edac.c
32398@@ -441,7 +441,7 @@ static void __devexit x38_remove_one(struct pci_dev *pdev)
32399 edac_mc_free(mci);
32400 }
32401
32402-static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
32403+static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
32404 {
32405 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32406 X38},
32407diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
32408index 3fc2ceb..daf098f 100644
32409--- a/drivers/firewire/core-card.c
32410+++ b/drivers/firewire/core-card.c
32411@@ -558,7 +558,7 @@ void fw_card_release(struct kref *kref)
32412
32413 void fw_core_remove_card(struct fw_card *card)
32414 {
32415- struct fw_card_driver dummy_driver = dummy_driver_template;
32416+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
32417
32418 card->driver->update_phy_reg(card, 4,
32419 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
32420diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
32421index 4560d8f..36db24a 100644
32422--- a/drivers/firewire/core-cdev.c
32423+++ b/drivers/firewire/core-cdev.c
32424@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct client *client,
32425 int ret;
32426
32427 if ((request->channels == 0 && request->bandwidth == 0) ||
32428- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
32429- request->bandwidth < 0)
32430+ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
32431 return -EINVAL;
32432
32433 r = kmalloc(sizeof(*r), GFP_KERNEL);
32434diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
32435index da628c7..cf54a2c 100644
32436--- a/drivers/firewire/core-transaction.c
32437+++ b/drivers/firewire/core-transaction.c
32438@@ -36,6 +36,7 @@
32439 #include <linux/string.h>
32440 #include <linux/timer.h>
32441 #include <linux/types.h>
32442+#include <linux/sched.h>
32443
32444 #include <asm/byteorder.h>
32445
32446@@ -344,6 +345,8 @@ int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
32447 struct transaction_callback_data d;
32448 struct fw_transaction t;
32449
32450+ pax_track_stack();
32451+
32452 init_completion(&d.done);
32453 d.payload = payload;
32454 fw_send_request(card, &t, tcode, destination_id, generation, speed,
32455diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
32456index 7ff6e75..a2965d9 100644
32457--- a/drivers/firewire/core.h
32458+++ b/drivers/firewire/core.h
32459@@ -86,6 +86,7 @@ struct fw_card_driver {
32460
32461 int (*stop_iso)(struct fw_iso_context *ctx);
32462 };
32463+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
32464
32465 void fw_card_initialize(struct fw_card *card,
32466 const struct fw_card_driver *driver, struct device *device);
32467diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
32468index 3a2ccb0..82fd7c4 100644
32469--- a/drivers/firmware/dmi_scan.c
32470+++ b/drivers/firmware/dmi_scan.c
32471@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
32472 }
32473 }
32474 else {
32475- /*
32476- * no iounmap() for that ioremap(); it would be a no-op, but
32477- * it's so early in setup that sucker gets confused into doing
32478- * what it shouldn't if we actually call it.
32479- */
32480 p = dmi_ioremap(0xF0000, 0x10000);
32481 if (p == NULL)
32482 goto error;
32483@@ -667,7 +662,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
32484 if (buf == NULL)
32485 return -1;
32486
32487- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
32488+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
32489
32490 iounmap(buf);
32491 return 0;
32492diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
32493index 9e4f59d..110e24e 100644
32494--- a/drivers/firmware/edd.c
32495+++ b/drivers/firmware/edd.c
32496@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, struct attribute *attr, char *buf)
32497 return ret;
32498 }
32499
32500-static struct sysfs_ops edd_attr_ops = {
32501+static const struct sysfs_ops edd_attr_ops = {
32502 .show = edd_attr_show,
32503 };
32504
32505diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
32506index f4f709d..082f06e 100644
32507--- a/drivers/firmware/efivars.c
32508+++ b/drivers/firmware/efivars.c
32509@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct kobject *kobj, struct attribute *attr,
32510 return ret;
32511 }
32512
32513-static struct sysfs_ops efivar_attr_ops = {
32514+static const struct sysfs_ops efivar_attr_ops = {
32515 .show = efivar_attr_show,
32516 .store = efivar_attr_store,
32517 };
32518diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
32519index 051d1eb..0a5d4e7 100644
32520--- a/drivers/firmware/iscsi_ibft.c
32521+++ b/drivers/firmware/iscsi_ibft.c
32522@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struct kobject *kobj,
32523 return ret;
32524 }
32525
32526-static struct sysfs_ops ibft_attr_ops = {
32527+static const struct sysfs_ops ibft_attr_ops = {
32528 .show = ibft_show_attribute,
32529 };
32530
32531diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
32532index 56f9234..8c58c7b 100644
32533--- a/drivers/firmware/memmap.c
32534+++ b/drivers/firmware/memmap.c
32535@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
32536 NULL
32537 };
32538
32539-static struct sysfs_ops memmap_attr_ops = {
32540+static const struct sysfs_ops memmap_attr_ops = {
32541 .show = memmap_attr_show,
32542 };
32543
32544diff --git a/drivers/gpio/vr41xx_giu.c b/drivers/gpio/vr41xx_giu.c
32545index b16c9a8..2af7d3f 100644
32546--- a/drivers/gpio/vr41xx_giu.c
32547+++ b/drivers/gpio/vr41xx_giu.c
32548@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
32549 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
32550 maskl, pendl, maskh, pendh);
32551
32552- atomic_inc(&irq_err_count);
32553+ atomic_inc_unchecked(&irq_err_count);
32554
32555 return -EINVAL;
32556 }
32557diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
32558index bea6efc..3dc0f42 100644
32559--- a/drivers/gpu/drm/drm_crtc.c
32560+++ b/drivers/gpu/drm/drm_crtc.c
32561@@ -1323,7 +1323,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
32562 */
32563 if ((out_resp->count_modes >= mode_count) && mode_count) {
32564 copied = 0;
32565- mode_ptr = (struct drm_mode_modeinfo *)(unsigned long)out_resp->modes_ptr;
32566+ mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
32567 list_for_each_entry(mode, &connector->modes, head) {
32568 drm_crtc_convert_to_umode(&u_mode, mode);
32569 if (copy_to_user(mode_ptr + copied,
32570@@ -1338,8 +1338,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
32571
32572 if ((out_resp->count_props >= props_count) && props_count) {
32573 copied = 0;
32574- prop_ptr = (uint32_t *)(unsigned long)(out_resp->props_ptr);
32575- prop_values = (uint64_t *)(unsigned long)(out_resp->prop_values_ptr);
32576+ prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
32577+ prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
32578 for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
32579 if (connector->property_ids[i] != 0) {
32580 if (put_user(connector->property_ids[i],
32581@@ -1361,7 +1361,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
32582
32583 if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
32584 copied = 0;
32585- encoder_ptr = (uint32_t *)(unsigned long)(out_resp->encoders_ptr);
32586+ encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
32587 for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
32588 if (connector->encoder_ids[i] != 0) {
32589 if (put_user(connector->encoder_ids[i],
32590@@ -1513,7 +1513,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
32591 }
32592
32593 for (i = 0; i < crtc_req->count_connectors; i++) {
32594- set_connectors_ptr = (uint32_t *)(unsigned long)crtc_req->set_connectors_ptr;
32595+ set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
32596 if (get_user(out_id, &set_connectors_ptr[i])) {
32597 ret = -EFAULT;
32598 goto out;
32599@@ -2118,7 +2118,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
32600 out_resp->flags = property->flags;
32601
32602 if ((out_resp->count_values >= value_count) && value_count) {
32603- values_ptr = (uint64_t *)(unsigned long)out_resp->values_ptr;
32604+ values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
32605 for (i = 0; i < value_count; i++) {
32606 if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
32607 ret = -EFAULT;
32608@@ -2131,7 +2131,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
32609 if (property->flags & DRM_MODE_PROP_ENUM) {
32610 if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
32611 copied = 0;
32612- enum_ptr = (struct drm_mode_property_enum *)(unsigned long)out_resp->enum_blob_ptr;
32613+ enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
32614 list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
32615
32616 if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
32617@@ -2154,7 +2154,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
32618 if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
32619 copied = 0;
32620 blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
32621- blob_length_ptr = (uint32_t *)(unsigned long)out_resp->values_ptr;
32622+ blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp->values_ptr;
32623
32624 list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
32625 if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
32626@@ -2226,7 +2226,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
32627 blob = obj_to_blob(obj);
32628
32629 if (out_resp->length == blob->length) {
32630- blob_ptr = (void *)(unsigned long)out_resp->data;
32631+ blob_ptr = (void __user *)(unsigned long)out_resp->data;
32632 if (copy_to_user(blob_ptr, blob->data, blob->length)){
32633 ret = -EFAULT;
32634 goto done;
32635diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
32636index 1b8745d..92fdbf6 100644
32637--- a/drivers/gpu/drm/drm_crtc_helper.c
32638+++ b/drivers/gpu/drm/drm_crtc_helper.c
32639@@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
32640 struct drm_crtc *tmp;
32641 int crtc_mask = 1;
32642
32643- WARN(!crtc, "checking null crtc?");
32644+ BUG_ON(!crtc);
32645
32646 dev = crtc->dev;
32647
32648@@ -642,6 +642,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
32649
32650 adjusted_mode = drm_mode_duplicate(dev, mode);
32651
32652+ pax_track_stack();
32653+
32654 crtc->enabled = drm_helper_crtc_in_use(crtc);
32655
32656 if (!crtc->enabled)
32657diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
32658index 0e27d98..dec8768 100644
32659--- a/drivers/gpu/drm/drm_drv.c
32660+++ b/drivers/gpu/drm/drm_drv.c
32661@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struct file *filp,
32662 char *kdata = NULL;
32663
32664 atomic_inc(&dev->ioctl_count);
32665- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
32666+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
32667 ++file_priv->ioctl_count;
32668
32669 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
32670diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
32671index 519161e..98c840c 100644
32672--- a/drivers/gpu/drm/drm_fops.c
32673+++ b/drivers/gpu/drm/drm_fops.c
32674@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * dev)
32675 }
32676
32677 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
32678- atomic_set(&dev->counts[i], 0);
32679+ atomic_set_unchecked(&dev->counts[i], 0);
32680
32681 dev->sigdata.lock = NULL;
32682
32683@@ -130,9 +130,9 @@ int drm_open(struct inode *inode, struct file *filp)
32684
32685 retcode = drm_open_helper(inode, filp, dev);
32686 if (!retcode) {
32687- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
32688+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
32689 spin_lock(&dev->count_lock);
32690- if (!dev->open_count++) {
32691+ if (local_inc_return(&dev->open_count) == 1) {
32692 spin_unlock(&dev->count_lock);
32693 retcode = drm_setup(dev);
32694 goto out;
32695@@ -435,7 +435,7 @@ int drm_release(struct inode *inode, struct file *filp)
32696
32697 lock_kernel();
32698
32699- DRM_DEBUG("open_count = %d\n", dev->open_count);
32700+ DRM_DEBUG("open_count = %d\n", local_read(&dev->open_count));
32701
32702 if (dev->driver->preclose)
32703 dev->driver->preclose(dev, file_priv);
32704@@ -447,7 +447,7 @@ int drm_release(struct inode *inode, struct file *filp)
32705 DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
32706 task_pid_nr(current),
32707 (long)old_encode_dev(file_priv->minor->device),
32708- dev->open_count);
32709+ local_read(&dev->open_count));
32710
32711 /* Release any auth tokens that might point to this file_priv,
32712 (do that under the drm_global_mutex) */
32713@@ -529,9 +529,9 @@ int drm_release(struct inode *inode, struct file *filp)
32714 * End inline drm_release
32715 */
32716
32717- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
32718+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
32719 spin_lock(&dev->count_lock);
32720- if (!--dev->open_count) {
32721+ if (local_dec_and_test(&dev->open_count)) {
32722 if (atomic_read(&dev->ioctl_count)) {
32723 DRM_ERROR("Device busy: %d\n",
32724 atomic_read(&dev->ioctl_count));
32725diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
32726index 8bf3770..79422805 100644
32727--- a/drivers/gpu/drm/drm_gem.c
32728+++ b/drivers/gpu/drm/drm_gem.c
32729@@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev)
32730 spin_lock_init(&dev->object_name_lock);
32731 idr_init(&dev->object_name_idr);
32732 atomic_set(&dev->object_count, 0);
32733- atomic_set(&dev->object_memory, 0);
32734+ atomic_set_unchecked(&dev->object_memory, 0);
32735 atomic_set(&dev->pin_count, 0);
32736- atomic_set(&dev->pin_memory, 0);
32737+ atomic_set_unchecked(&dev->pin_memory, 0);
32738 atomic_set(&dev->gtt_count, 0);
32739- atomic_set(&dev->gtt_memory, 0);
32740+ atomic_set_unchecked(&dev->gtt_memory, 0);
32741
32742 mm = kzalloc(sizeof(struct drm_gem_mm), GFP_KERNEL);
32743 if (!mm) {
32744@@ -150,7 +150,7 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size)
32745 goto fput;
32746 }
32747 atomic_inc(&dev->object_count);
32748- atomic_add(obj->size, &dev->object_memory);
32749+ atomic_add_unchecked(obj->size, &dev->object_memory);
32750 return obj;
32751 fput:
32752 fput(obj->filp);
32753@@ -429,7 +429,7 @@ drm_gem_object_free(struct kref *kref)
32754
32755 fput(obj->filp);
32756 atomic_dec(&dev->object_count);
32757- atomic_sub(obj->size, &dev->object_memory);
32758+ atomic_sub_unchecked(obj->size, &dev->object_memory);
32759 kfree(obj);
32760 }
32761 EXPORT_SYMBOL(drm_gem_object_free);
32762diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
32763index f0f6c6b..34af322 100644
32764--- a/drivers/gpu/drm/drm_info.c
32765+++ b/drivers/gpu/drm/drm_info.c
32766@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
32767 struct drm_local_map *map;
32768 struct drm_map_list *r_list;
32769
32770- /* Hardcoded from _DRM_FRAME_BUFFER,
32771- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
32772- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
32773- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
32774+ static const char * const types[] = {
32775+ [_DRM_FRAME_BUFFER] = "FB",
32776+ [_DRM_REGISTERS] = "REG",
32777+ [_DRM_SHM] = "SHM",
32778+ [_DRM_AGP] = "AGP",
32779+ [_DRM_SCATTER_GATHER] = "SG",
32780+ [_DRM_CONSISTENT] = "PCI",
32781+ [_DRM_GEM] = "GEM" };
32782 const char *type;
32783 int i;
32784
32785@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
32786 map = r_list->map;
32787 if (!map)
32788 continue;
32789- if (map->type < 0 || map->type > 5)
32790+ if (map->type >= ARRAY_SIZE(types))
32791 type = "??";
32792 else
32793 type = types[map->type];
32794@@ -265,10 +269,10 @@ int drm_gem_object_info(struct seq_file *m, void* data)
32795 struct drm_device *dev = node->minor->dev;
32796
32797 seq_printf(m, "%d objects\n", atomic_read(&dev->object_count));
32798- seq_printf(m, "%d object bytes\n", atomic_read(&dev->object_memory));
32799+ seq_printf(m, "%d object bytes\n", atomic_read_unchecked(&dev->object_memory));
32800 seq_printf(m, "%d pinned\n", atomic_read(&dev->pin_count));
32801- seq_printf(m, "%d pin bytes\n", atomic_read(&dev->pin_memory));
32802- seq_printf(m, "%d gtt bytes\n", atomic_read(&dev->gtt_memory));
32803+ seq_printf(m, "%d pin bytes\n", atomic_read_unchecked(&dev->pin_memory));
32804+ seq_printf(m, "%d gtt bytes\n", atomic_read_unchecked(&dev->gtt_memory));
32805 seq_printf(m, "%d gtt total\n", dev->gtt_total);
32806 return 0;
32807 }
32808@@ -288,7 +292,11 @@ int drm_vma_info(struct seq_file *m, void *data)
32809 mutex_lock(&dev->struct_mutex);
32810 seq_printf(m, "vma use count: %d, high_memory = %p, 0x%08llx\n",
32811 atomic_read(&dev->vma_count),
32812+#ifdef CONFIG_GRKERNSEC_HIDESYM
32813+ NULL, 0);
32814+#else
32815 high_memory, (u64)virt_to_phys(high_memory));
32816+#endif
32817
32818 list_for_each_entry(pt, &dev->vmalist, head) {
32819 vma = pt->vma;
32820@@ -296,14 +304,23 @@ int drm_vma_info(struct seq_file *m, void *data)
32821 continue;
32822 seq_printf(m,
32823 "\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx000",
32824- pt->pid, vma->vm_start, vma->vm_end,
32825+ pt->pid,
32826+#ifdef CONFIG_GRKERNSEC_HIDESYM
32827+ 0, 0,
32828+#else
32829+ vma->vm_start, vma->vm_end,
32830+#endif
32831 vma->vm_flags & VM_READ ? 'r' : '-',
32832 vma->vm_flags & VM_WRITE ? 'w' : '-',
32833 vma->vm_flags & VM_EXEC ? 'x' : '-',
32834 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
32835 vma->vm_flags & VM_LOCKED ? 'l' : '-',
32836 vma->vm_flags & VM_IO ? 'i' : '-',
32837+#ifdef CONFIG_GRKERNSEC_HIDESYM
32838+ 0);
32839+#else
32840 vma->vm_pgoff);
32841+#endif
32842
32843 #if defined(__i386__)
32844 pgprot = pgprot_val(vma->vm_page_prot);
32845diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
32846index 282d9fd..71e5f11 100644
32847--- a/drivers/gpu/drm/drm_ioc32.c
32848+++ b/drivers/gpu/drm/drm_ioc32.c
32849@@ -463,7 +463,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
32850 request = compat_alloc_user_space(nbytes);
32851 if (!access_ok(VERIFY_WRITE, request, nbytes))
32852 return -EFAULT;
32853- list = (struct drm_buf_desc *) (request + 1);
32854+ list = (struct drm_buf_desc __user *) (request + 1);
32855
32856 if (__put_user(count, &request->count)
32857 || __put_user(list, &request->list))
32858@@ -525,7 +525,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
32859 request = compat_alloc_user_space(nbytes);
32860 if (!access_ok(VERIFY_WRITE, request, nbytes))
32861 return -EFAULT;
32862- list = (struct drm_buf_pub *) (request + 1);
32863+ list = (struct drm_buf_pub __user *) (request + 1);
32864
32865 if (__put_user(count, &request->count)
32866 || __put_user(list, &request->list))
32867diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
32868index 9b9ff46..4ea724c 100644
32869--- a/drivers/gpu/drm/drm_ioctl.c
32870+++ b/drivers/gpu/drm/drm_ioctl.c
32871@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, void *data,
32872 stats->data[i].value =
32873 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
32874 else
32875- stats->data[i].value = atomic_read(&dev->counts[i]);
32876+ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
32877 stats->data[i].type = dev->types[i];
32878 }
32879
32880diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
32881index e2f70a5..c703e86 100644
32882--- a/drivers/gpu/drm/drm_lock.c
32883+++ b/drivers/gpu/drm/drm_lock.c
32884@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
32885 if (drm_lock_take(&master->lock, lock->context)) {
32886 master->lock.file_priv = file_priv;
32887 master->lock.lock_time = jiffies;
32888- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
32889+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
32890 break; /* Got lock */
32891 }
32892
32893@@ -165,7 +165,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
32894 return -EINVAL;
32895 }
32896
32897- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
32898+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
32899
32900 /* kernel_context_switch isn't used by any of the x86 drm
32901 * modules but is required by the Sparc driver.
32902diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
32903index 7d1d88c..b9131b2 100644
32904--- a/drivers/gpu/drm/i810/i810_dma.c
32905+++ b/drivers/gpu/drm/i810/i810_dma.c
32906@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
32907 dma->buflist[vertex->idx],
32908 vertex->discard, vertex->used);
32909
32910- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
32911- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
32912+ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
32913+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
32914 sarea_priv->last_enqueue = dev_priv->counter - 1;
32915 sarea_priv->last_dispatch = (int)hw_status[5];
32916
32917@@ -1115,8 +1115,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
32918 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
32919 mc->last_render);
32920
32921- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
32922- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
32923+ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
32924+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
32925 sarea_priv->last_enqueue = dev_priv->counter - 1;
32926 sarea_priv->last_dispatch = (int)hw_status[5];
32927
32928diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
32929index 21e2691..7321edd 100644
32930--- a/drivers/gpu/drm/i810/i810_drv.h
32931+++ b/drivers/gpu/drm/i810/i810_drv.h
32932@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
32933 int page_flipping;
32934
32935 wait_queue_head_t irq_queue;
32936- atomic_t irq_received;
32937- atomic_t irq_emitted;
32938+ atomic_unchecked_t irq_received;
32939+ atomic_unchecked_t irq_emitted;
32940
32941 int front_offset;
32942 } drm_i810_private_t;
32943diff --git a/drivers/gpu/drm/i830/i830_drv.h b/drivers/gpu/drm/i830/i830_drv.h
32944index da82afe..48a45de 100644
32945--- a/drivers/gpu/drm/i830/i830_drv.h
32946+++ b/drivers/gpu/drm/i830/i830_drv.h
32947@@ -115,8 +115,8 @@ typedef struct drm_i830_private {
32948 int page_flipping;
32949
32950 wait_queue_head_t irq_queue;
32951- atomic_t irq_received;
32952- atomic_t irq_emitted;
32953+ atomic_unchecked_t irq_received;
32954+ atomic_unchecked_t irq_emitted;
32955
32956 int use_mi_batchbuffer_start;
32957
32958diff --git a/drivers/gpu/drm/i830/i830_irq.c b/drivers/gpu/drm/i830/i830_irq.c
32959index 91ec2bb..6f21fab 100644
32960--- a/drivers/gpu/drm/i830/i830_irq.c
32961+++ b/drivers/gpu/drm/i830/i830_irq.c
32962@@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS)
32963
32964 I830_WRITE16(I830REG_INT_IDENTITY_R, temp);
32965
32966- atomic_inc(&dev_priv->irq_received);
32967+ atomic_inc_unchecked(&dev_priv->irq_received);
32968 wake_up_interruptible(&dev_priv->irq_queue);
32969
32970 return IRQ_HANDLED;
32971@@ -60,14 +60,14 @@ static int i830_emit_irq(struct drm_device * dev)
32972
32973 DRM_DEBUG("%s\n", __func__);
32974
32975- atomic_inc(&dev_priv->irq_emitted);
32976+ atomic_inc_unchecked(&dev_priv->irq_emitted);
32977
32978 BEGIN_LP_RING(2);
32979 OUT_RING(0);
32980 OUT_RING(GFX_OP_USER_INTERRUPT);
32981 ADVANCE_LP_RING();
32982
32983- return atomic_read(&dev_priv->irq_emitted);
32984+ return atomic_read_unchecked(&dev_priv->irq_emitted);
32985 }
32986
32987 static int i830_wait_irq(struct drm_device * dev, int irq_nr)
32988@@ -79,7 +79,7 @@ static int i830_wait_irq(struct drm_device * dev, int irq_nr)
32989
32990 DRM_DEBUG("%s\n", __func__);
32991
32992- if (atomic_read(&dev_priv->irq_received) >= irq_nr)
32993+ if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
32994 return 0;
32995
32996 dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT;
32997@@ -88,7 +88,7 @@ static int i830_wait_irq(struct drm_device * dev, int irq_nr)
32998
32999 for (;;) {
33000 __set_current_state(TASK_INTERRUPTIBLE);
33001- if (atomic_read(&dev_priv->irq_received) >= irq_nr)
33002+ if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
33003 break;
33004 if ((signed)(end - jiffies) <= 0) {
33005 DRM_ERROR("timeout iir %x imr %x ier %x hwstam %x\n",
33006@@ -163,8 +163,8 @@ void i830_driver_irq_preinstall(struct drm_device * dev)
33007 I830_WRITE16(I830REG_HWSTAM, 0xffff);
33008 I830_WRITE16(I830REG_INT_MASK_R, 0x0);
33009 I830_WRITE16(I830REG_INT_ENABLE_R, 0x0);
33010- atomic_set(&dev_priv->irq_received, 0);
33011- atomic_set(&dev_priv->irq_emitted, 0);
33012+ atomic_set_unchecked(&dev_priv->irq_received, 0);
33013+ atomic_set_unchecked(&dev_priv->irq_emitted, 0);
33014 init_waitqueue_head(&dev_priv->irq_queue);
33015 }
33016
33017diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h
33018index 288fc50..c6092055 100644
33019--- a/drivers/gpu/drm/i915/dvo.h
33020+++ b/drivers/gpu/drm/i915/dvo.h
33021@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
33022 *
33023 * \return singly-linked list of modes or NULL if no modes found.
33024 */
33025- struct drm_display_mode *(*get_modes)(struct intel_dvo_device *dvo);
33026+ struct drm_display_mode *(* const get_modes)(struct intel_dvo_device *dvo);
33027
33028 /**
33029 * Clean up driver-specific bits of the output
33030 */
33031- void (*destroy) (struct intel_dvo_device *dvo);
33032+ void (* const destroy) (struct intel_dvo_device *dvo);
33033
33034 /**
33035 * Debugging hook to dump device registers to log file
33036 */
33037- void (*dump_regs)(struct intel_dvo_device *dvo);
33038+ void (* const dump_regs)(struct intel_dvo_device *dvo);
33039 };
33040
33041-extern struct intel_dvo_dev_ops sil164_ops;
33042-extern struct intel_dvo_dev_ops ch7xxx_ops;
33043-extern struct intel_dvo_dev_ops ivch_ops;
33044-extern struct intel_dvo_dev_ops tfp410_ops;
33045-extern struct intel_dvo_dev_ops ch7017_ops;
33046+extern const struct intel_dvo_dev_ops sil164_ops;
33047+extern const struct intel_dvo_dev_ops ch7xxx_ops;
33048+extern const struct intel_dvo_dev_ops ivch_ops;
33049+extern const struct intel_dvo_dev_ops tfp410_ops;
33050+extern const struct intel_dvo_dev_ops ch7017_ops;
33051
33052 #endif /* _INTEL_DVO_H */
33053diff --git a/drivers/gpu/drm/i915/dvo_ch7017.c b/drivers/gpu/drm/i915/dvo_ch7017.c
33054index 621815b..499d82e 100644
33055--- a/drivers/gpu/drm/i915/dvo_ch7017.c
33056+++ b/drivers/gpu/drm/i915/dvo_ch7017.c
33057@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_dvo_device *dvo)
33058 }
33059 }
33060
33061-struct intel_dvo_dev_ops ch7017_ops = {
33062+const struct intel_dvo_dev_ops ch7017_ops = {
33063 .init = ch7017_init,
33064 .detect = ch7017_detect,
33065 .mode_valid = ch7017_mode_valid,
33066diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c
33067index a9b8962..ac769ba 100644
33068--- a/drivers/gpu/drm/i915/dvo_ch7xxx.c
33069+++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c
33070@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_dvo_device *dvo)
33071 }
33072 }
33073
33074-struct intel_dvo_dev_ops ch7xxx_ops = {
33075+const struct intel_dvo_dev_ops ch7xxx_ops = {
33076 .init = ch7xxx_init,
33077 .detect = ch7xxx_detect,
33078 .mode_valid = ch7xxx_mode_valid,
33079diff --git a/drivers/gpu/drm/i915/dvo_ivch.c b/drivers/gpu/drm/i915/dvo_ivch.c
33080index aa176f9..ed2930c 100644
33081--- a/drivers/gpu/drm/i915/dvo_ivch.c
33082+++ b/drivers/gpu/drm/i915/dvo_ivch.c
33083@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dvo_device *dvo)
33084 }
33085 }
33086
33087-struct intel_dvo_dev_ops ivch_ops= {
33088+const struct intel_dvo_dev_ops ivch_ops= {
33089 .init = ivch_init,
33090 .dpms = ivch_dpms,
33091 .save = ivch_save,
33092diff --git a/drivers/gpu/drm/i915/dvo_sil164.c b/drivers/gpu/drm/i915/dvo_sil164.c
33093index e1c1f73..7dbebcf 100644
33094--- a/drivers/gpu/drm/i915/dvo_sil164.c
33095+++ b/drivers/gpu/drm/i915/dvo_sil164.c
33096@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_dvo_device *dvo)
33097 }
33098 }
33099
33100-struct intel_dvo_dev_ops sil164_ops = {
33101+const struct intel_dvo_dev_ops sil164_ops = {
33102 .init = sil164_init,
33103 .detect = sil164_detect,
33104 .mode_valid = sil164_mode_valid,
33105diff --git a/drivers/gpu/drm/i915/dvo_tfp410.c b/drivers/gpu/drm/i915/dvo_tfp410.c
33106index 16dce84..7e1b6f8 100644
33107--- a/drivers/gpu/drm/i915/dvo_tfp410.c
33108+++ b/drivers/gpu/drm/i915/dvo_tfp410.c
33109@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_dvo_device *dvo)
33110 }
33111 }
33112
33113-struct intel_dvo_dev_ops tfp410_ops = {
33114+const struct intel_dvo_dev_ops tfp410_ops = {
33115 .init = tfp410_init,
33116 .detect = tfp410_detect,
33117 .mode_valid = tfp410_mode_valid,
33118diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
33119index 7e859d6..7d1cf2b 100644
33120--- a/drivers/gpu/drm/i915/i915_debugfs.c
33121+++ b/drivers/gpu/drm/i915/i915_debugfs.c
33122@@ -192,7 +192,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
33123 I915_READ(GTIMR));
33124 }
33125 seq_printf(m, "Interrupts received: %d\n",
33126- atomic_read(&dev_priv->irq_received));
33127+ atomic_read_unchecked(&dev_priv->irq_received));
33128 if (dev_priv->hw_status_page != NULL) {
33129 seq_printf(m, "Current sequence: %d\n",
33130 i915_get_gem_seqno(dev));
33131diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
33132index 5449239..7e4f68d 100644
33133--- a/drivers/gpu/drm/i915/i915_drv.c
33134+++ b/drivers/gpu/drm/i915/i915_drv.c
33135@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
33136 return i915_resume(dev);
33137 }
33138
33139-static struct vm_operations_struct i915_gem_vm_ops = {
33140+static const struct vm_operations_struct i915_gem_vm_ops = {
33141 .fault = i915_gem_fault,
33142 .open = drm_gem_vm_open,
33143 .close = drm_gem_vm_close,
33144diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
33145index 97163f7..c24c7c7 100644
33146--- a/drivers/gpu/drm/i915/i915_drv.h
33147+++ b/drivers/gpu/drm/i915/i915_drv.h
33148@@ -168,7 +168,7 @@ struct drm_i915_display_funcs {
33149 /* display clock increase/decrease */
33150 /* pll clock increase/decrease */
33151 /* clock gating init */
33152-};
33153+} __no_const;
33154
33155 typedef struct drm_i915_private {
33156 struct drm_device *dev;
33157@@ -197,7 +197,7 @@ typedef struct drm_i915_private {
33158 int page_flipping;
33159
33160 wait_queue_head_t irq_queue;
33161- atomic_t irq_received;
33162+ atomic_unchecked_t irq_received;
33163 /** Protects user_irq_refcount and irq_mask_reg */
33164 spinlock_t user_irq_lock;
33165 /** Refcount for i915_user_irq_get() versus i915_user_irq_put(). */
33166diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
33167index 27a3074..eb3f959 100644
33168--- a/drivers/gpu/drm/i915/i915_gem.c
33169+++ b/drivers/gpu/drm/i915/i915_gem.c
33170@@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
33171
33172 args->aper_size = dev->gtt_total;
33173 args->aper_available_size = (args->aper_size -
33174- atomic_read(&dev->pin_memory));
33175+ atomic_read_unchecked(&dev->pin_memory));
33176
33177 return 0;
33178 }
33179@@ -2058,7 +2058,7 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
33180
33181 if (obj_priv->gtt_space) {
33182 atomic_dec(&dev->gtt_count);
33183- atomic_sub(obj->size, &dev->gtt_memory);
33184+ atomic_sub_unchecked(obj->size, &dev->gtt_memory);
33185
33186 drm_mm_put_block(obj_priv->gtt_space);
33187 obj_priv->gtt_space = NULL;
33188@@ -2701,7 +2701,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
33189 goto search_free;
33190 }
33191 atomic_inc(&dev->gtt_count);
33192- atomic_add(obj->size, &dev->gtt_memory);
33193+ atomic_add_unchecked(obj->size, &dev->gtt_memory);
33194
33195 /* Assert that the object is not currently in any GPU domain. As it
33196 * wasn't in the GTT, there shouldn't be any way it could have been in
33197@@ -3755,9 +3755,9 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
33198 "%d/%d gtt bytes\n",
33199 atomic_read(&dev->object_count),
33200 atomic_read(&dev->pin_count),
33201- atomic_read(&dev->object_memory),
33202- atomic_read(&dev->pin_memory),
33203- atomic_read(&dev->gtt_memory),
33204+ atomic_read_unchecked(&dev->object_memory),
33205+ atomic_read_unchecked(&dev->pin_memory),
33206+ atomic_read_unchecked(&dev->gtt_memory),
33207 dev->gtt_total);
33208 }
33209 goto err;
33210@@ -3989,7 +3989,7 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)
33211 */
33212 if (obj_priv->pin_count == 1) {
33213 atomic_inc(&dev->pin_count);
33214- atomic_add(obj->size, &dev->pin_memory);
33215+ atomic_add_unchecked(obj->size, &dev->pin_memory);
33216 if (!obj_priv->active &&
33217 (obj->write_domain & I915_GEM_GPU_DOMAINS) == 0 &&
33218 !list_empty(&obj_priv->list))
33219@@ -4022,7 +4022,7 @@ i915_gem_object_unpin(struct drm_gem_object *obj)
33220 list_move_tail(&obj_priv->list,
33221 &dev_priv->mm.inactive_list);
33222 atomic_dec(&dev->pin_count);
33223- atomic_sub(obj->size, &dev->pin_memory);
33224+ atomic_sub_unchecked(obj->size, &dev->pin_memory);
33225 }
33226 i915_verify_inactive(dev, __FILE__, __LINE__);
33227 }
33228diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
33229index 63f28ad..f5469da 100644
33230--- a/drivers/gpu/drm/i915/i915_irq.c
33231+++ b/drivers/gpu/drm/i915/i915_irq.c
33232@@ -528,7 +528,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
33233 int irq_received;
33234 int ret = IRQ_NONE;
33235
33236- atomic_inc(&dev_priv->irq_received);
33237+ atomic_inc_unchecked(&dev_priv->irq_received);
33238
33239 if (IS_IGDNG(dev))
33240 return igdng_irq_handler(dev);
33241@@ -1021,7 +1021,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
33242 {
33243 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
33244
33245- atomic_set(&dev_priv->irq_received, 0);
33246+ atomic_set_unchecked(&dev_priv->irq_received, 0);
33247
33248 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
33249 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
33250diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
33251index 5d9c6a7..d1b0e29 100644
33252--- a/drivers/gpu/drm/i915/intel_sdvo.c
33253+++ b/drivers/gpu/drm/i915/intel_sdvo.c
33254@@ -2795,7 +2795,9 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
33255 sdvo_priv->slave_addr = intel_sdvo_get_slave_addr(dev, output_device);
33256
33257 /* Save the bit-banging i2c functionality for use by the DDC wrapper */
33258- intel_sdvo_i2c_bit_algo.functionality = intel_output->i2c_bus->algo->functionality;
33259+ pax_open_kernel();
33260+ *(void **)&intel_sdvo_i2c_bit_algo.functionality = intel_output->i2c_bus->algo->functionality;
33261+ pax_close_kernel();
33262
33263 /* Read the regs to test if we can talk to the device */
33264 for (i = 0; i < 0x40; i++) {
33265diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
33266index be6c6b9..8615d9c 100644
33267--- a/drivers/gpu/drm/mga/mga_drv.h
33268+++ b/drivers/gpu/drm/mga/mga_drv.h
33269@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
33270 u32 clear_cmd;
33271 u32 maccess;
33272
33273- atomic_t vbl_received; /**< Number of vblanks received. */
33274+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
33275 wait_queue_head_t fence_queue;
33276- atomic_t last_fence_retired;
33277+ atomic_unchecked_t last_fence_retired;
33278 u32 next_fence_to_post;
33279
33280 unsigned int fb_cpp;
33281diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
33282index daa6041..a28a5da 100644
33283--- a/drivers/gpu/drm/mga/mga_irq.c
33284+++ b/drivers/gpu/drm/mga/mga_irq.c
33285@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
33286 if (crtc != 0)
33287 return 0;
33288
33289- return atomic_read(&dev_priv->vbl_received);
33290+ return atomic_read_unchecked(&dev_priv->vbl_received);
33291 }
33292
33293
33294@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
33295 /* VBLANK interrupt */
33296 if (status & MGA_VLINEPEN) {
33297 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
33298- atomic_inc(&dev_priv->vbl_received);
33299+ atomic_inc_unchecked(&dev_priv->vbl_received);
33300 drm_handle_vblank(dev, 0);
33301 handled = 1;
33302 }
33303@@ -80,7 +80,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
33304 MGA_WRITE(MGA_PRIMEND, prim_end);
33305 }
33306
33307- atomic_inc(&dev_priv->last_fence_retired);
33308+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
33309 DRM_WAKEUP(&dev_priv->fence_queue);
33310 handled = 1;
33311 }
33312@@ -131,7 +131,7 @@ int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence)
33313 * using fences.
33314 */
33315 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
33316- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
33317+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
33318 - *sequence) <= (1 << 23)));
33319
33320 *sequence = cur_fence;
33321diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
33322index 4c39a40..b22a9ea 100644
33323--- a/drivers/gpu/drm/r128/r128_cce.c
33324+++ b/drivers/gpu/drm/r128/r128_cce.c
33325@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
33326
33327 /* GH: Simple idle check.
33328 */
33329- atomic_set(&dev_priv->idle_count, 0);
33330+ atomic_set_unchecked(&dev_priv->idle_count, 0);
33331
33332 /* We don't support anything other than bus-mastering ring mode,
33333 * but the ring can be in either AGP or PCI space for the ring
33334diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
33335index 3c60829..4faf484 100644
33336--- a/drivers/gpu/drm/r128/r128_drv.h
33337+++ b/drivers/gpu/drm/r128/r128_drv.h
33338@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
33339 int is_pci;
33340 unsigned long cce_buffers_offset;
33341
33342- atomic_t idle_count;
33343+ atomic_unchecked_t idle_count;
33344
33345 int page_flipping;
33346 int current_page;
33347 u32 crtc_offset;
33348 u32 crtc_offset_cntl;
33349
33350- atomic_t vbl_received;
33351+ atomic_unchecked_t vbl_received;
33352
33353 u32 color_fmt;
33354 unsigned int front_offset;
33355diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
33356index 69810fb..97bf17a 100644
33357--- a/drivers/gpu/drm/r128/r128_irq.c
33358+++ b/drivers/gpu/drm/r128/r128_irq.c
33359@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
33360 if (crtc != 0)
33361 return 0;
33362
33363- return atomic_read(&dev_priv->vbl_received);
33364+ return atomic_read_unchecked(&dev_priv->vbl_received);
33365 }
33366
33367 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
33368@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
33369 /* VBLANK interrupt */
33370 if (status & R128_CRTC_VBLANK_INT) {
33371 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
33372- atomic_inc(&dev_priv->vbl_received);
33373+ atomic_inc_unchecked(&dev_priv->vbl_received);
33374 drm_handle_vblank(dev, 0);
33375 return IRQ_HANDLED;
33376 }
33377diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
33378index af2665c..51922d2 100644
33379--- a/drivers/gpu/drm/r128/r128_state.c
33380+++ b/drivers/gpu/drm/r128/r128_state.c
33381@@ -323,10 +323,10 @@ static void r128_clear_box(drm_r128_private_t * dev_priv,
33382
33383 static void r128_cce_performance_boxes(drm_r128_private_t * dev_priv)
33384 {
33385- if (atomic_read(&dev_priv->idle_count) == 0) {
33386+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0) {
33387 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
33388 } else {
33389- atomic_set(&dev_priv->idle_count, 0);
33390+ atomic_set_unchecked(&dev_priv->idle_count, 0);
33391 }
33392 }
33393
33394diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
33395index dd72b91..8644b3c 100644
33396--- a/drivers/gpu/drm/radeon/atom.c
33397+++ b/drivers/gpu/drm/radeon/atom.c
33398@@ -1115,6 +1115,8 @@ struct atom_context *atom_parse(struct card_info *card, void *bios)
33399 char name[512];
33400 int i;
33401
33402+ pax_track_stack();
33403+
33404 ctx->card = card;
33405 ctx->bios = bios;
33406
33407diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
33408index 0d79577..efaa7a5 100644
33409--- a/drivers/gpu/drm/radeon/mkregtable.c
33410+++ b/drivers/gpu/drm/radeon/mkregtable.c
33411@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
33412 regex_t mask_rex;
33413 regmatch_t match[4];
33414 char buf[1024];
33415- size_t end;
33416+ long end;
33417 int len;
33418 int done = 0;
33419 int r;
33420 unsigned o;
33421 struct offset *offset;
33422 char last_reg_s[10];
33423- int last_reg;
33424+ unsigned long last_reg;
33425
33426 if (regcomp
33427 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
33428diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
33429index 6735213..38c2c67 100644
33430--- a/drivers/gpu/drm/radeon/radeon.h
33431+++ b/drivers/gpu/drm/radeon/radeon.h
33432@@ -149,7 +149,7 @@ int radeon_pm_init(struct radeon_device *rdev);
33433 */
33434 struct radeon_fence_driver {
33435 uint32_t scratch_reg;
33436- atomic_t seq;
33437+ atomic_unchecked_t seq;
33438 uint32_t last_seq;
33439 unsigned long count_timeout;
33440 wait_queue_head_t queue;
33441@@ -640,7 +640,7 @@ struct radeon_asic {
33442 uint32_t offset, uint32_t obj_size);
33443 int (*clear_surface_reg)(struct radeon_device *rdev, int reg);
33444 void (*bandwidth_update)(struct radeon_device *rdev);
33445-};
33446+} __no_const;
33447
33448 /*
33449 * Asic structures
33450diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
33451index 4e928b9..d8b6008 100644
33452--- a/drivers/gpu/drm/radeon/radeon_atombios.c
33453+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
33454@@ -275,6 +275,8 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
33455 bool linkb;
33456 struct radeon_i2c_bus_rec ddc_bus;
33457
33458+ pax_track_stack();
33459+
33460 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
33461
33462 if (data_offset == 0)
33463@@ -520,13 +522,13 @@ static uint16_t atombios_get_connector_object_id(struct drm_device *dev,
33464 }
33465 }
33466
33467-struct bios_connector {
33468+static struct bios_connector {
33469 bool valid;
33470 uint16_t line_mux;
33471 uint16_t devices;
33472 int connector_type;
33473 struct radeon_i2c_bus_rec ddc_bus;
33474-};
33475+} bios_connectors[ATOM_MAX_SUPPORTED_DEVICE];
33476
33477 bool radeon_get_atom_connector_info_from_supported_devices_table(struct
33478 drm_device
33479@@ -542,7 +544,6 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct
33480 uint8_t dac;
33481 union atom_supported_devices *supported_devices;
33482 int i, j;
33483- struct bios_connector bios_connectors[ATOM_MAX_SUPPORTED_DEVICE];
33484
33485 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
33486
33487diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
33488index 083a181..ccccae0 100644
33489--- a/drivers/gpu/drm/radeon/radeon_display.c
33490+++ b/drivers/gpu/drm/radeon/radeon_display.c
33491@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pll *pll,
33492
33493 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
33494 error = freq - current_freq;
33495- error = error < 0 ? 0xffffffff : error;
33496+ error = (int32_t)error < 0 ? 0xffffffff : error;
33497 } else
33498 error = abs(current_freq - freq);
33499 vco_diff = abs(vco - best_vco);
33500diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
33501index 76e4070..193fa7f 100644
33502--- a/drivers/gpu/drm/radeon/radeon_drv.h
33503+++ b/drivers/gpu/drm/radeon/radeon_drv.h
33504@@ -253,7 +253,7 @@ typedef struct drm_radeon_private {
33505
33506 /* SW interrupt */
33507 wait_queue_head_t swi_queue;
33508- atomic_t swi_emitted;
33509+ atomic_unchecked_t swi_emitted;
33510 int vblank_crtc;
33511 uint32_t irq_enable_reg;
33512 uint32_t r500_disp_irq_reg;
33513diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
33514index 3beb26d..6ce9c4a 100644
33515--- a/drivers/gpu/drm/radeon/radeon_fence.c
33516+++ b/drivers/gpu/drm/radeon/radeon_fence.c
33517@@ -47,7 +47,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
33518 write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
33519 return 0;
33520 }
33521- fence->seq = atomic_add_return(1, &rdev->fence_drv.seq);
33522+ fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq);
33523 if (!rdev->cp.ready) {
33524 /* FIXME: cp is not running assume everythings is done right
33525 * away
33526@@ -364,7 +364,7 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
33527 return r;
33528 }
33529 WREG32(rdev->fence_drv.scratch_reg, 0);
33530- atomic_set(&rdev->fence_drv.seq, 0);
33531+ atomic_set_unchecked(&rdev->fence_drv.seq, 0);
33532 INIT_LIST_HEAD(&rdev->fence_drv.created);
33533 INIT_LIST_HEAD(&rdev->fence_drv.emited);
33534 INIT_LIST_HEAD(&rdev->fence_drv.signaled);
33535diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
33536index a1bf11d..4a123c0 100644
33537--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
33538+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
33539@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
33540 request = compat_alloc_user_space(sizeof(*request));
33541 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
33542 || __put_user(req32.param, &request->param)
33543- || __put_user((void __user *)(unsigned long)req32.value,
33544+ || __put_user((unsigned long)req32.value,
33545 &request->value))
33546 return -EFAULT;
33547
33548diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
33549index b79ecc4..8dab92d 100644
33550--- a/drivers/gpu/drm/radeon/radeon_irq.c
33551+++ b/drivers/gpu/drm/radeon/radeon_irq.c
33552@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
33553 unsigned int ret;
33554 RING_LOCALS;
33555
33556- atomic_inc(&dev_priv->swi_emitted);
33557- ret = atomic_read(&dev_priv->swi_emitted);
33558+ atomic_inc_unchecked(&dev_priv->swi_emitted);
33559+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
33560
33561 BEGIN_RING(4);
33562 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
33563@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
33564 drm_radeon_private_t *dev_priv =
33565 (drm_radeon_private_t *) dev->dev_private;
33566
33567- atomic_set(&dev_priv->swi_emitted, 0);
33568+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
33569 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
33570
33571 dev->max_vblank_count = 0x001fffff;
33572diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
33573index 4747910..48ca4b3 100644
33574--- a/drivers/gpu/drm/radeon/radeon_state.c
33575+++ b/drivers/gpu/drm/radeon/radeon_state.c
33576@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
33577 {
33578 drm_radeon_private_t *dev_priv = dev->dev_private;
33579 drm_radeon_getparam_t *param = data;
33580- int value;
33581+ int value = 0;
33582
33583 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
33584
33585diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
33586index 1381e06..0e53b17 100644
33587--- a/drivers/gpu/drm/radeon/radeon_ttm.c
33588+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
33589@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_device *rdev)
33590 DRM_INFO("radeon: ttm finalized\n");
33591 }
33592
33593-static struct vm_operations_struct radeon_ttm_vm_ops;
33594-static const struct vm_operations_struct *ttm_vm_ops = NULL;
33595-
33596-static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
33597-{
33598- struct ttm_buffer_object *bo;
33599- int r;
33600-
33601- bo = (struct ttm_buffer_object *)vma->vm_private_data;
33602- if (bo == NULL) {
33603- return VM_FAULT_NOPAGE;
33604- }
33605- r = ttm_vm_ops->fault(vma, vmf);
33606- return r;
33607-}
33608-
33609 int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
33610 {
33611 struct drm_file *file_priv;
33612 struct radeon_device *rdev;
33613- int r;
33614
33615 if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) {
33616 return drm_mmap(filp, vma);
33617@@ -563,20 +546,9 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
33618
33619 file_priv = (struct drm_file *)filp->private_data;
33620 rdev = file_priv->minor->dev->dev_private;
33621- if (rdev == NULL) {
33622+ if (!rdev)
33623 return -EINVAL;
33624- }
33625- r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
33626- if (unlikely(r != 0)) {
33627- return r;
33628- }
33629- if (unlikely(ttm_vm_ops == NULL)) {
33630- ttm_vm_ops = vma->vm_ops;
33631- radeon_ttm_vm_ops = *ttm_vm_ops;
33632- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
33633- }
33634- vma->vm_ops = &radeon_ttm_vm_ops;
33635- return 0;
33636+ return ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
33637 }
33638
33639
33640diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
33641index b12ff76..0bd0c6e 100644
33642--- a/drivers/gpu/drm/radeon/rs690.c
33643+++ b/drivers/gpu/drm/radeon/rs690.c
33644@@ -302,9 +302,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
33645 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
33646 rdev->pm.sideport_bandwidth.full)
33647 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
33648- read_delay_latency.full = rfixed_const(370 * 800 * 1000);
33649+ read_delay_latency.full = rfixed_const(800 * 1000);
33650 read_delay_latency.full = rfixed_div(read_delay_latency,
33651 rdev->pm.igp_sideport_mclk);
33652+ a.full = rfixed_const(370);
33653+ read_delay_latency.full = rfixed_mul(read_delay_latency, a);
33654 } else {
33655 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
33656 rdev->pm.k8_bandwidth.full)
33657diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
33658index 0ed436e..e6e7ce3 100644
33659--- a/drivers/gpu/drm/ttm/ttm_bo.c
33660+++ b/drivers/gpu/drm/ttm/ttm_bo.c
33661@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_attrs[] = {
33662 NULL
33663 };
33664
33665-static struct sysfs_ops ttm_bo_global_ops = {
33666+static const struct sysfs_ops ttm_bo_global_ops = {
33667 .show = &ttm_bo_global_show
33668 };
33669
33670diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
33671index 1c040d0..f9e4af8 100644
33672--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
33673+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
33674@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
33675 {
33676 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
33677 vma->vm_private_data;
33678- struct ttm_bo_device *bdev = bo->bdev;
33679+ struct ttm_bo_device *bdev;
33680 unsigned long bus_base;
33681 unsigned long bus_offset;
33682 unsigned long bus_size;
33683@@ -88,6 +88,10 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
33684 unsigned long address = (unsigned long)vmf->virtual_address;
33685 int retval = VM_FAULT_NOPAGE;
33686
33687+ if (!bo)
33688+ return VM_FAULT_NOPAGE;
33689+ bdev = bo->bdev;
33690+
33691 /*
33692 * Work around locking order reversal in fault / nopfn
33693 * between mmap_sem and bo_reserve: Perform a trylock operation
33694diff --git a/drivers/gpu/drm/ttm/ttm_global.c b/drivers/gpu/drm/ttm/ttm_global.c
33695index b170071..28ae90e 100644
33696--- a/drivers/gpu/drm/ttm/ttm_global.c
33697+++ b/drivers/gpu/drm/ttm/ttm_global.c
33698@@ -36,7 +36,7 @@
33699 struct ttm_global_item {
33700 struct mutex mutex;
33701 void *object;
33702- int refcount;
33703+ atomic_t refcount;
33704 };
33705
33706 static struct ttm_global_item glob[TTM_GLOBAL_NUM];
33707@@ -49,7 +49,7 @@ void ttm_global_init(void)
33708 struct ttm_global_item *item = &glob[i];
33709 mutex_init(&item->mutex);
33710 item->object = NULL;
33711- item->refcount = 0;
33712+ atomic_set(&item->refcount, 0);
33713 }
33714 }
33715
33716@@ -59,7 +59,7 @@ void ttm_global_release(void)
33717 for (i = 0; i < TTM_GLOBAL_NUM; ++i) {
33718 struct ttm_global_item *item = &glob[i];
33719 BUG_ON(item->object != NULL);
33720- BUG_ON(item->refcount != 0);
33721+ BUG_ON(atomic_read(&item->refcount) != 0);
33722 }
33723 }
33724
33725@@ -70,7 +70,7 @@ int ttm_global_item_ref(struct ttm_global_reference *ref)
33726 void *object;
33727
33728 mutex_lock(&item->mutex);
33729- if (item->refcount == 0) {
33730+ if (atomic_read(&item->refcount) == 0) {
33731 item->object = kzalloc(ref->size, GFP_KERNEL);
33732 if (unlikely(item->object == NULL)) {
33733 ret = -ENOMEM;
33734@@ -83,7 +83,7 @@ int ttm_global_item_ref(struct ttm_global_reference *ref)
33735 goto out_err;
33736
33737 }
33738- ++item->refcount;
33739+ atomic_inc(&item->refcount);
33740 ref->object = item->object;
33741 object = item->object;
33742 mutex_unlock(&item->mutex);
33743@@ -100,9 +100,9 @@ void ttm_global_item_unref(struct ttm_global_reference *ref)
33744 struct ttm_global_item *item = &glob[ref->global_type];
33745
33746 mutex_lock(&item->mutex);
33747- BUG_ON(item->refcount == 0);
33748+ BUG_ON(atomic_read(&item->refcount) == 0);
33749 BUG_ON(ref->object != item->object);
33750- if (--item->refcount == 0) {
33751+ if (atomic_dec_and_test(&item->refcount)) {
33752 ref->release(ref);
33753 item->object = NULL;
33754 }
33755diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
33756index 072c281..d8ef483 100644
33757--- a/drivers/gpu/drm/ttm/ttm_memory.c
33758+++ b/drivers/gpu/drm/ttm/ttm_memory.c
33759@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_attrs[] = {
33760 NULL
33761 };
33762
33763-static struct sysfs_ops ttm_mem_zone_ops = {
33764+static const struct sysfs_ops ttm_mem_zone_ops = {
33765 .show = &ttm_mem_zone_show,
33766 .store = &ttm_mem_zone_store
33767 };
33768diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
33769index cafcb84..b8e66cc 100644
33770--- a/drivers/gpu/drm/via/via_drv.h
33771+++ b/drivers/gpu/drm/via/via_drv.h
33772@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
33773 typedef uint32_t maskarray_t[5];
33774
33775 typedef struct drm_via_irq {
33776- atomic_t irq_received;
33777+ atomic_unchecked_t irq_received;
33778 uint32_t pending_mask;
33779 uint32_t enable_mask;
33780 wait_queue_head_t irq_queue;
33781@@ -75,7 +75,7 @@ typedef struct drm_via_private {
33782 struct timeval last_vblank;
33783 int last_vblank_valid;
33784 unsigned usec_per_vblank;
33785- atomic_t vbl_received;
33786+ atomic_unchecked_t vbl_received;
33787 drm_via_state_t hc_state;
33788 char pci_buf[VIA_PCI_BUF_SIZE];
33789 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
33790diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
33791index 5935b88..127a8a6 100644
33792--- a/drivers/gpu/drm/via/via_irq.c
33793+++ b/drivers/gpu/drm/via/via_irq.c
33794@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
33795 if (crtc != 0)
33796 return 0;
33797
33798- return atomic_read(&dev_priv->vbl_received);
33799+ return atomic_read_unchecked(&dev_priv->vbl_received);
33800 }
33801
33802 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
33803@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
33804
33805 status = VIA_READ(VIA_REG_INTERRUPT);
33806 if (status & VIA_IRQ_VBLANK_PENDING) {
33807- atomic_inc(&dev_priv->vbl_received);
33808- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
33809+ atomic_inc_unchecked(&dev_priv->vbl_received);
33810+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
33811 do_gettimeofday(&cur_vblank);
33812 if (dev_priv->last_vblank_valid) {
33813 dev_priv->usec_per_vblank =
33814@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
33815 dev_priv->last_vblank = cur_vblank;
33816 dev_priv->last_vblank_valid = 1;
33817 }
33818- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
33819+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
33820 DRM_DEBUG("US per vblank is: %u\n",
33821 dev_priv->usec_per_vblank);
33822 }
33823@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
33824
33825 for (i = 0; i < dev_priv->num_irqs; ++i) {
33826 if (status & cur_irq->pending_mask) {
33827- atomic_inc(&cur_irq->irq_received);
33828+ atomic_inc_unchecked(&cur_irq->irq_received);
33829 DRM_WAKEUP(&cur_irq->irq_queue);
33830 handled = 1;
33831 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i) {
33832@@ -244,11 +244,11 @@ via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequenc
33833 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
33834 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
33835 masks[irq][4]));
33836- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
33837+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
33838 } else {
33839 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
33840 (((cur_irq_sequence =
33841- atomic_read(&cur_irq->irq_received)) -
33842+ atomic_read_unchecked(&cur_irq->irq_received)) -
33843 *sequence) <= (1 << 23)));
33844 }
33845 *sequence = cur_irq_sequence;
33846@@ -286,7 +286,7 @@ void via_driver_irq_preinstall(struct drm_device * dev)
33847 }
33848
33849 for (i = 0; i < dev_priv->num_irqs; ++i) {
33850- atomic_set(&cur_irq->irq_received, 0);
33851+ atomic_set_unchecked(&cur_irq->irq_received, 0);
33852 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
33853 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
33854 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
33855@@ -368,7 +368,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
33856 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
33857 case VIA_IRQ_RELATIVE:
33858 irqwait->request.sequence +=
33859- atomic_read(&cur_irq->irq_received);
33860+ atomic_read_unchecked(&cur_irq->irq_received);
33861 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
33862 case VIA_IRQ_ABSOLUTE:
33863 break;
33864diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
33865index aa8688d..6a0140c 100644
33866--- a/drivers/gpu/vga/vgaarb.c
33867+++ b/drivers/gpu/vga/vgaarb.c
33868@@ -894,14 +894,20 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
33869 uc = &priv->cards[i];
33870 }
33871
33872- if (!uc)
33873- return -EINVAL;
33874+ if (!uc) {
33875+ ret_val = -EINVAL;
33876+ goto done;
33877+ }
33878
33879- if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0)
33880- return -EINVAL;
33881+ if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0) {
33882+ ret_val = -EINVAL;
33883+ goto done;
33884+ }
33885
33886- if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0)
33887- return -EINVAL;
33888+ if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0) {
33889+ ret_val = -EINVAL;
33890+ goto done;
33891+ }
33892
33893 vga_put(pdev, io_state);
33894
33895diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
33896index 11f8069..4783396 100644
33897--- a/drivers/hid/hid-core.c
33898+++ b/drivers/hid/hid-core.c
33899@@ -1752,7 +1752,7 @@ static bool hid_ignore(struct hid_device *hdev)
33900
33901 int hid_add_device(struct hid_device *hdev)
33902 {
33903- static atomic_t id = ATOMIC_INIT(0);
33904+ static atomic_unchecked_t id = ATOMIC_INIT(0);
33905 int ret;
33906
33907 if (WARN_ON(hdev->status & HID_STAT_ADDED))
33908@@ -1766,7 +1766,7 @@ int hid_add_device(struct hid_device *hdev)
33909 /* XXX hack, any other cleaner solution after the driver core
33910 * is converted to allow more than 20 bytes as the device name? */
33911 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
33912- hdev->vendor, hdev->product, atomic_inc_return(&id));
33913+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
33914
33915 ret = device_add(&hdev->dev);
33916 if (!ret)
33917diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
33918index 8b6ee24..70f657d 100644
33919--- a/drivers/hid/usbhid/hiddev.c
33920+++ b/drivers/hid/usbhid/hiddev.c
33921@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
33922 return put_user(HID_VERSION, (int __user *)arg);
33923
33924 case HIDIOCAPPLICATION:
33925- if (arg < 0 || arg >= hid->maxapplication)
33926+ if (arg >= hid->maxapplication)
33927 return -EINVAL;
33928
33929 for (i = 0; i < hid->maxcollection; i++)
33930diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c
33931index 5d5ed69..f40533e 100644
33932--- a/drivers/hwmon/lis3lv02d.c
33933+++ b/drivers/hwmon/lis3lv02d.c
33934@@ -146,7 +146,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *dummy)
33935 * the lid is closed. This leads to interrupts as soon as a little move
33936 * is done.
33937 */
33938- atomic_inc(&lis3_dev.count);
33939+ atomic_inc_unchecked(&lis3_dev.count);
33940
33941 wake_up_interruptible(&lis3_dev.misc_wait);
33942 kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
33943@@ -160,7 +160,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
33944 if (test_and_set_bit(0, &lis3_dev.misc_opened))
33945 return -EBUSY; /* already open */
33946
33947- atomic_set(&lis3_dev.count, 0);
33948+ atomic_set_unchecked(&lis3_dev.count, 0);
33949
33950 /*
33951 * The sensor can generate interrupts for free-fall and direction
33952@@ -206,7 +206,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
33953 add_wait_queue(&lis3_dev.misc_wait, &wait);
33954 while (true) {
33955 set_current_state(TASK_INTERRUPTIBLE);
33956- data = atomic_xchg(&lis3_dev.count, 0);
33957+ data = atomic_xchg_unchecked(&lis3_dev.count, 0);
33958 if (data)
33959 break;
33960
33961@@ -244,7 +244,7 @@ out:
33962 static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
33963 {
33964 poll_wait(file, &lis3_dev.misc_wait, wait);
33965- if (atomic_read(&lis3_dev.count))
33966+ if (atomic_read_unchecked(&lis3_dev.count))
33967 return POLLIN | POLLRDNORM;
33968 return 0;
33969 }
33970diff --git a/drivers/hwmon/lis3lv02d.h b/drivers/hwmon/lis3lv02d.h
33971index 7cdd76f..fe0efdf 100644
33972--- a/drivers/hwmon/lis3lv02d.h
33973+++ b/drivers/hwmon/lis3lv02d.h
33974@@ -201,7 +201,7 @@ struct lis3lv02d {
33975
33976 struct input_polled_dev *idev; /* input device */
33977 struct platform_device *pdev; /* platform device */
33978- atomic_t count; /* interrupt count after last read */
33979+ atomic_unchecked_t count; /* interrupt count after last read */
33980 int xcalib; /* calibrated null value for x */
33981 int ycalib; /* calibrated null value for y */
33982 int zcalib; /* calibrated null value for z */
33983diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
33984index 740785e..5a5c6c6 100644
33985--- a/drivers/hwmon/sht15.c
33986+++ b/drivers/hwmon/sht15.c
33987@@ -112,7 +112,7 @@ struct sht15_data {
33988 int supply_uV;
33989 int supply_uV_valid;
33990 struct work_struct update_supply_work;
33991- atomic_t interrupt_handled;
33992+ atomic_unchecked_t interrupt_handled;
33993 };
33994
33995 /**
33996@@ -245,13 +245,13 @@ static inline int sht15_update_single_val(struct sht15_data *data,
33997 return ret;
33998
33999 gpio_direction_input(data->pdata->gpio_data);
34000- atomic_set(&data->interrupt_handled, 0);
34001+ atomic_set_unchecked(&data->interrupt_handled, 0);
34002
34003 enable_irq(gpio_to_irq(data->pdata->gpio_data));
34004 if (gpio_get_value(data->pdata->gpio_data) == 0) {
34005 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
34006 /* Only relevant if the interrupt hasn't occured. */
34007- if (!atomic_read(&data->interrupt_handled))
34008+ if (!atomic_read_unchecked(&data->interrupt_handled))
34009 schedule_work(&data->read_work);
34010 }
34011 ret = wait_event_timeout(data->wait_queue,
34012@@ -398,7 +398,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
34013 struct sht15_data *data = d;
34014 /* First disable the interrupt */
34015 disable_irq_nosync(irq);
34016- atomic_inc(&data->interrupt_handled);
34017+ atomic_inc_unchecked(&data->interrupt_handled);
34018 /* Then schedule a reading work struct */
34019 if (data->flag != SHT15_READING_NOTHING)
34020 schedule_work(&data->read_work);
34021@@ -449,11 +449,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
34022 here as could have gone low in meantime so verify
34023 it hasn't!
34024 */
34025- atomic_set(&data->interrupt_handled, 0);
34026+ atomic_set_unchecked(&data->interrupt_handled, 0);
34027 enable_irq(gpio_to_irq(data->pdata->gpio_data));
34028 /* If still not occured or another handler has been scheduled */
34029 if (gpio_get_value(data->pdata->gpio_data)
34030- || atomic_read(&data->interrupt_handled))
34031+ || atomic_read_unchecked(&data->interrupt_handled))
34032 return;
34033 }
34034 /* Read the data back from the device */
34035diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
34036index 97851c5..cb40626 100644
34037--- a/drivers/hwmon/w83791d.c
34038+++ b/drivers/hwmon/w83791d.c
34039@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_client *client, int kind,
34040 struct i2c_board_info *info);
34041 static int w83791d_remove(struct i2c_client *client);
34042
34043-static int w83791d_read(struct i2c_client *client, u8 register);
34044-static int w83791d_write(struct i2c_client *client, u8 register, u8 value);
34045+static int w83791d_read(struct i2c_client *client, u8 reg);
34046+static int w83791d_write(struct i2c_client *client, u8 reg, u8 value);
34047 static struct w83791d_data *w83791d_update_device(struct device *dev);
34048
34049 #ifdef DEBUG
34050diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
34051index 378fcb5..5e91fa8 100644
34052--- a/drivers/i2c/busses/i2c-amd756-s4882.c
34053+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
34054@@ -43,7 +43,7 @@
34055 extern struct i2c_adapter amd756_smbus;
34056
34057 static struct i2c_adapter *s4882_adapter;
34058-static struct i2c_algorithm *s4882_algo;
34059+static i2c_algorithm_no_const *s4882_algo;
34060
34061 /* Wrapper access functions for multiplexed SMBus */
34062 static DEFINE_MUTEX(amd756_lock);
34063diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
34064index 29015eb..af2d8e9 100644
34065--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
34066+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
34067@@ -41,7 +41,7 @@
34068 extern struct i2c_adapter *nforce2_smbus;
34069
34070 static struct i2c_adapter *s4985_adapter;
34071-static struct i2c_algorithm *s4985_algo;
34072+static i2c_algorithm_no_const *s4985_algo;
34073
34074 /* Wrapper access functions for multiplexed SMBus */
34075 static DEFINE_MUTEX(nforce2_lock);
34076diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
34077index 878f8ec..12376fc 100644
34078--- a/drivers/ide/aec62xx.c
34079+++ b/drivers/ide/aec62xx.c
34080@@ -180,7 +180,7 @@ static const struct ide_port_ops atp86x_port_ops = {
34081 .cable_detect = atp86x_cable_detect,
34082 };
34083
34084-static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
34085+static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
34086 { /* 0: AEC6210 */
34087 .name = DRV_NAME,
34088 .init_chipset = init_chipset_aec62xx,
34089diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
34090index e59b6de..4b4fc65 100644
34091--- a/drivers/ide/alim15x3.c
34092+++ b/drivers/ide/alim15x3.c
34093@@ -509,7 +509,7 @@ static const struct ide_dma_ops ali_dma_ops = {
34094 .dma_sff_read_status = ide_dma_sff_read_status,
34095 };
34096
34097-static const struct ide_port_info ali15x3_chipset __devinitdata = {
34098+static const struct ide_port_info ali15x3_chipset __devinitconst = {
34099 .name = DRV_NAME,
34100 .init_chipset = init_chipset_ali15x3,
34101 .init_hwif = init_hwif_ali15x3,
34102diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
34103index 628cd2e..087a414 100644
34104--- a/drivers/ide/amd74xx.c
34105+++ b/drivers/ide/amd74xx.c
34106@@ -221,7 +221,7 @@ static const struct ide_port_ops amd_port_ops = {
34107 .udma_mask = udma, \
34108 }
34109
34110-static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
34111+static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
34112 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
34113 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
34114 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
34115diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
34116index 837322b..837fd71 100644
34117--- a/drivers/ide/atiixp.c
34118+++ b/drivers/ide/atiixp.c
34119@@ -137,7 +137,7 @@ static const struct ide_port_ops atiixp_port_ops = {
34120 .cable_detect = atiixp_cable_detect,
34121 };
34122
34123-static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
34124+static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
34125 { /* 0: IXP200/300/400/700 */
34126 .name = DRV_NAME,
34127 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
34128diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
34129index ca0c46f..d55318a 100644
34130--- a/drivers/ide/cmd64x.c
34131+++ b/drivers/ide/cmd64x.c
34132@@ -372,7 +372,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
34133 .dma_sff_read_status = ide_dma_sff_read_status,
34134 };
34135
34136-static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
34137+static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
34138 { /* 0: CMD643 */
34139 .name = DRV_NAME,
34140 .init_chipset = init_chipset_cmd64x,
34141diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
34142index 09f98ed..cebc5bc 100644
34143--- a/drivers/ide/cs5520.c
34144+++ b/drivers/ide/cs5520.c
34145@@ -93,7 +93,7 @@ static const struct ide_port_ops cs5520_port_ops = {
34146 .set_dma_mode = cs5520_set_dma_mode,
34147 };
34148
34149-static const struct ide_port_info cyrix_chipset __devinitdata = {
34150+static const struct ide_port_info cyrix_chipset __devinitconst = {
34151 .name = DRV_NAME,
34152 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
34153 .port_ops = &cs5520_port_ops,
34154diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
34155index 40bf05e..7d58ca0 100644
34156--- a/drivers/ide/cs5530.c
34157+++ b/drivers/ide/cs5530.c
34158@@ -244,7 +244,7 @@ static const struct ide_port_ops cs5530_port_ops = {
34159 .udma_filter = cs5530_udma_filter,
34160 };
34161
34162-static const struct ide_port_info cs5530_chipset __devinitdata = {
34163+static const struct ide_port_info cs5530_chipset __devinitconst = {
34164 .name = DRV_NAME,
34165 .init_chipset = init_chipset_cs5530,
34166 .init_hwif = init_hwif_cs5530,
34167diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
34168index 983d957..53e6172 100644
34169--- a/drivers/ide/cs5535.c
34170+++ b/drivers/ide/cs5535.c
34171@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
34172 .cable_detect = cs5535_cable_detect,
34173 };
34174
34175-static const struct ide_port_info cs5535_chipset __devinitdata = {
34176+static const struct ide_port_info cs5535_chipset __devinitconst = {
34177 .name = DRV_NAME,
34178 .port_ops = &cs5535_port_ops,
34179 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
34180diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
34181index 74fc540..8e933d8 100644
34182--- a/drivers/ide/cy82c693.c
34183+++ b/drivers/ide/cy82c693.c
34184@@ -288,7 +288,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
34185 .set_dma_mode = cy82c693_set_dma_mode,
34186 };
34187
34188-static const struct ide_port_info cy82c693_chipset __devinitdata = {
34189+static const struct ide_port_info cy82c693_chipset __devinitconst = {
34190 .name = DRV_NAME,
34191 .init_iops = init_iops_cy82c693,
34192 .port_ops = &cy82c693_port_ops,
34193diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
34194index 7ce68ef..e78197d 100644
34195--- a/drivers/ide/hpt366.c
34196+++ b/drivers/ide/hpt366.c
34197@@ -507,7 +507,7 @@ static struct hpt_timings hpt37x_timings = {
34198 }
34199 };
34200
34201-static const struct hpt_info hpt36x __devinitdata = {
34202+static const struct hpt_info hpt36x __devinitconst = {
34203 .chip_name = "HPT36x",
34204 .chip_type = HPT36x,
34205 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
34206@@ -515,7 +515,7 @@ static const struct hpt_info hpt36x __devinitdata = {
34207 .timings = &hpt36x_timings
34208 };
34209
34210-static const struct hpt_info hpt370 __devinitdata = {
34211+static const struct hpt_info hpt370 __devinitconst = {
34212 .chip_name = "HPT370",
34213 .chip_type = HPT370,
34214 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
34215@@ -523,7 +523,7 @@ static const struct hpt_info hpt370 __devinitdata = {
34216 .timings = &hpt37x_timings
34217 };
34218
34219-static const struct hpt_info hpt370a __devinitdata = {
34220+static const struct hpt_info hpt370a __devinitconst = {
34221 .chip_name = "HPT370A",
34222 .chip_type = HPT370A,
34223 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
34224@@ -531,7 +531,7 @@ static const struct hpt_info hpt370a __devinitdata = {
34225 .timings = &hpt37x_timings
34226 };
34227
34228-static const struct hpt_info hpt374 __devinitdata = {
34229+static const struct hpt_info hpt374 __devinitconst = {
34230 .chip_name = "HPT374",
34231 .chip_type = HPT374,
34232 .udma_mask = ATA_UDMA5,
34233@@ -539,7 +539,7 @@ static const struct hpt_info hpt374 __devinitdata = {
34234 .timings = &hpt37x_timings
34235 };
34236
34237-static const struct hpt_info hpt372 __devinitdata = {
34238+static const struct hpt_info hpt372 __devinitconst = {
34239 .chip_name = "HPT372",
34240 .chip_type = HPT372,
34241 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34242@@ -547,7 +547,7 @@ static const struct hpt_info hpt372 __devinitdata = {
34243 .timings = &hpt37x_timings
34244 };
34245
34246-static const struct hpt_info hpt372a __devinitdata = {
34247+static const struct hpt_info hpt372a __devinitconst = {
34248 .chip_name = "HPT372A",
34249 .chip_type = HPT372A,
34250 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34251@@ -555,7 +555,7 @@ static const struct hpt_info hpt372a __devinitdata = {
34252 .timings = &hpt37x_timings
34253 };
34254
34255-static const struct hpt_info hpt302 __devinitdata = {
34256+static const struct hpt_info hpt302 __devinitconst = {
34257 .chip_name = "HPT302",
34258 .chip_type = HPT302,
34259 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34260@@ -563,7 +563,7 @@ static const struct hpt_info hpt302 __devinitdata = {
34261 .timings = &hpt37x_timings
34262 };
34263
34264-static const struct hpt_info hpt371 __devinitdata = {
34265+static const struct hpt_info hpt371 __devinitconst = {
34266 .chip_name = "HPT371",
34267 .chip_type = HPT371,
34268 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34269@@ -571,7 +571,7 @@ static const struct hpt_info hpt371 __devinitdata = {
34270 .timings = &hpt37x_timings
34271 };
34272
34273-static const struct hpt_info hpt372n __devinitdata = {
34274+static const struct hpt_info hpt372n __devinitconst = {
34275 .chip_name = "HPT372N",
34276 .chip_type = HPT372N,
34277 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34278@@ -579,7 +579,7 @@ static const struct hpt_info hpt372n __devinitdata = {
34279 .timings = &hpt37x_timings
34280 };
34281
34282-static const struct hpt_info hpt302n __devinitdata = {
34283+static const struct hpt_info hpt302n __devinitconst = {
34284 .chip_name = "HPT302N",
34285 .chip_type = HPT302N,
34286 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34287@@ -587,7 +587,7 @@ static const struct hpt_info hpt302n __devinitdata = {
34288 .timings = &hpt37x_timings
34289 };
34290
34291-static const struct hpt_info hpt371n __devinitdata = {
34292+static const struct hpt_info hpt371n __devinitconst = {
34293 .chip_name = "HPT371N",
34294 .chip_type = HPT371N,
34295 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34296@@ -1422,7 +1422,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
34297 .dma_sff_read_status = ide_dma_sff_read_status,
34298 };
34299
34300-static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
34301+static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
34302 { /* 0: HPT36x */
34303 .name = DRV_NAME,
34304 .init_chipset = init_chipset_hpt366,
34305diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
34306index 2de76cc..74186a1 100644
34307--- a/drivers/ide/ide-cd.c
34308+++ b/drivers/ide/ide-cd.c
34309@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
34310 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
34311 if ((unsigned long)buf & alignment
34312 || blk_rq_bytes(rq) & q->dma_pad_mask
34313- || object_is_on_stack(buf))
34314+ || object_starts_on_stack(buf))
34315 drive->dma = 0;
34316 }
34317 }
34318diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
34319index fefbdfc..62ff465 100644
34320--- a/drivers/ide/ide-floppy.c
34321+++ b/drivers/ide/ide-floppy.c
34322@@ -373,6 +373,8 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
34323 u8 pc_buf[256], header_len, desc_cnt;
34324 int i, rc = 1, blocks, length;
34325
34326+ pax_track_stack();
34327+
34328 ide_debug_log(IDE_DBG_FUNC, "enter");
34329
34330 drive->bios_cyl = 0;
34331diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
34332index 39d4e01..11538ce 100644
34333--- a/drivers/ide/ide-pci-generic.c
34334+++ b/drivers/ide/ide-pci-generic.c
34335@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
34336 .udma_mask = ATA_UDMA6, \
34337 }
34338
34339-static const struct ide_port_info generic_chipsets[] __devinitdata = {
34340+static const struct ide_port_info generic_chipsets[] __devinitconst = {
34341 /* 0: Unknown */
34342 DECLARE_GENERIC_PCI_DEV(0),
34343
34344diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
34345index 0d266a5..aaca790 100644
34346--- a/drivers/ide/it8172.c
34347+++ b/drivers/ide/it8172.c
34348@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
34349 .set_dma_mode = it8172_set_dma_mode,
34350 };
34351
34352-static const struct ide_port_info it8172_port_info __devinitdata = {
34353+static const struct ide_port_info it8172_port_info __devinitconst = {
34354 .name = DRV_NAME,
34355 .port_ops = &it8172_port_ops,
34356 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
34357diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
34358index 4797616..4be488a 100644
34359--- a/drivers/ide/it8213.c
34360+++ b/drivers/ide/it8213.c
34361@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
34362 .cable_detect = it8213_cable_detect,
34363 };
34364
34365-static const struct ide_port_info it8213_chipset __devinitdata = {
34366+static const struct ide_port_info it8213_chipset __devinitconst = {
34367 .name = DRV_NAME,
34368 .enablebits = { {0x41, 0x80, 0x80} },
34369 .port_ops = &it8213_port_ops,
34370diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
34371index 51aa745..146ee60 100644
34372--- a/drivers/ide/it821x.c
34373+++ b/drivers/ide/it821x.c
34374@@ -627,7 +627,7 @@ static const struct ide_port_ops it821x_port_ops = {
34375 .cable_detect = it821x_cable_detect,
34376 };
34377
34378-static const struct ide_port_info it821x_chipset __devinitdata = {
34379+static const struct ide_port_info it821x_chipset __devinitconst = {
34380 .name = DRV_NAME,
34381 .init_chipset = init_chipset_it821x,
34382 .init_hwif = init_hwif_it821x,
34383diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
34384index bf2be64..9270098 100644
34385--- a/drivers/ide/jmicron.c
34386+++ b/drivers/ide/jmicron.c
34387@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
34388 .cable_detect = jmicron_cable_detect,
34389 };
34390
34391-static const struct ide_port_info jmicron_chipset __devinitdata = {
34392+static const struct ide_port_info jmicron_chipset __devinitconst = {
34393 .name = DRV_NAME,
34394 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
34395 .port_ops = &jmicron_port_ops,
34396diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
34397index 95327a2..73f78d8 100644
34398--- a/drivers/ide/ns87415.c
34399+++ b/drivers/ide/ns87415.c
34400@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
34401 .dma_sff_read_status = superio_dma_sff_read_status,
34402 };
34403
34404-static const struct ide_port_info ns87415_chipset __devinitdata = {
34405+static const struct ide_port_info ns87415_chipset __devinitconst = {
34406 .name = DRV_NAME,
34407 .init_hwif = init_hwif_ns87415,
34408 .tp_ops = &ns87415_tp_ops,
34409diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
34410index f1d70d6..e1de05b 100644
34411--- a/drivers/ide/opti621.c
34412+++ b/drivers/ide/opti621.c
34413@@ -202,7 +202,7 @@ static const struct ide_port_ops opti621_port_ops = {
34414 .set_pio_mode = opti621_set_pio_mode,
34415 };
34416
34417-static const struct ide_port_info opti621_chipset __devinitdata = {
34418+static const struct ide_port_info opti621_chipset __devinitconst = {
34419 .name = DRV_NAME,
34420 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
34421 .port_ops = &opti621_port_ops,
34422diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
34423index 65ba823..7311f4d 100644
34424--- a/drivers/ide/pdc202xx_new.c
34425+++ b/drivers/ide/pdc202xx_new.c
34426@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
34427 .udma_mask = udma, \
34428 }
34429
34430-static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
34431+static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
34432 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
34433 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
34434 };
34435diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
34436index cb812f3..af816ef 100644
34437--- a/drivers/ide/pdc202xx_old.c
34438+++ b/drivers/ide/pdc202xx_old.c
34439@@ -285,7 +285,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
34440 .max_sectors = sectors, \
34441 }
34442
34443-static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
34444+static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
34445 { /* 0: PDC20246 */
34446 .name = DRV_NAME,
34447 .init_chipset = init_chipset_pdc202xx,
34448diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
34449index bf14f39..15c4b98 100644
34450--- a/drivers/ide/piix.c
34451+++ b/drivers/ide/piix.c
34452@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
34453 .udma_mask = udma, \
34454 }
34455
34456-static const struct ide_port_info piix_pci_info[] __devinitdata = {
34457+static const struct ide_port_info piix_pci_info[] __devinitconst = {
34458 /* 0: MPIIX */
34459 { /*
34460 * MPIIX actually has only a single IDE channel mapped to
34461diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
34462index a6414a8..c04173e 100644
34463--- a/drivers/ide/rz1000.c
34464+++ b/drivers/ide/rz1000.c
34465@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
34466 }
34467 }
34468
34469-static const struct ide_port_info rz1000_chipset __devinitdata = {
34470+static const struct ide_port_info rz1000_chipset __devinitconst = {
34471 .name = DRV_NAME,
34472 .host_flags = IDE_HFLAG_NO_DMA,
34473 };
34474diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
34475index d467478..9203942 100644
34476--- a/drivers/ide/sc1200.c
34477+++ b/drivers/ide/sc1200.c
34478@@ -290,7 +290,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
34479 .dma_sff_read_status = ide_dma_sff_read_status,
34480 };
34481
34482-static const struct ide_port_info sc1200_chipset __devinitdata = {
34483+static const struct ide_port_info sc1200_chipset __devinitconst = {
34484 .name = DRV_NAME,
34485 .port_ops = &sc1200_port_ops,
34486 .dma_ops = &sc1200_dma_ops,
34487diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
34488index 1104bb3..59c5194 100644
34489--- a/drivers/ide/scc_pata.c
34490+++ b/drivers/ide/scc_pata.c
34491@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
34492 .dma_sff_read_status = scc_dma_sff_read_status,
34493 };
34494
34495-static const struct ide_port_info scc_chipset __devinitdata = {
34496+static const struct ide_port_info scc_chipset __devinitconst = {
34497 .name = "sccIDE",
34498 .init_iops = init_iops_scc,
34499 .init_dma = scc_init_dma,
34500diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
34501index b6554ef..6cc2cc3 100644
34502--- a/drivers/ide/serverworks.c
34503+++ b/drivers/ide/serverworks.c
34504@@ -353,7 +353,7 @@ static const struct ide_port_ops svwks_port_ops = {
34505 .cable_detect = svwks_cable_detect,
34506 };
34507
34508-static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
34509+static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
34510 { /* 0: OSB4 */
34511 .name = DRV_NAME,
34512 .init_chipset = init_chipset_svwks,
34513diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
34514index ab3db61..afed580 100644
34515--- a/drivers/ide/setup-pci.c
34516+++ b/drivers/ide/setup-pci.c
34517@@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev1, struct pci_dev *dev2,
34518 int ret, i, n_ports = dev2 ? 4 : 2;
34519 struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
34520
34521+ pax_track_stack();
34522+
34523 for (i = 0; i < n_ports / 2; i++) {
34524 ret = ide_setup_pci_controller(pdev[i], d, !i);
34525 if (ret < 0)
34526diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
34527index d95df52..0b03a39 100644
34528--- a/drivers/ide/siimage.c
34529+++ b/drivers/ide/siimage.c
34530@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
34531 .udma_mask = ATA_UDMA6, \
34532 }
34533
34534-static const struct ide_port_info siimage_chipsets[] __devinitdata = {
34535+static const struct ide_port_info siimage_chipsets[] __devinitconst = {
34536 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
34537 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
34538 };
34539diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
34540index 3b88eba..ca8699d 100644
34541--- a/drivers/ide/sis5513.c
34542+++ b/drivers/ide/sis5513.c
34543@@ -561,7 +561,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
34544 .cable_detect = sis_cable_detect,
34545 };
34546
34547-static const struct ide_port_info sis5513_chipset __devinitdata = {
34548+static const struct ide_port_info sis5513_chipset __devinitconst = {
34549 .name = DRV_NAME,
34550 .init_chipset = init_chipset_sis5513,
34551 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
34552diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
34553index d698da4..fca42a4 100644
34554--- a/drivers/ide/sl82c105.c
34555+++ b/drivers/ide/sl82c105.c
34556@@ -319,7 +319,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
34557 .dma_sff_read_status = ide_dma_sff_read_status,
34558 };
34559
34560-static const struct ide_port_info sl82c105_chipset __devinitdata = {
34561+static const struct ide_port_info sl82c105_chipset __devinitconst = {
34562 .name = DRV_NAME,
34563 .init_chipset = init_chipset_sl82c105,
34564 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
34565diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
34566index 1ccfb40..83d5779 100644
34567--- a/drivers/ide/slc90e66.c
34568+++ b/drivers/ide/slc90e66.c
34569@@ -131,7 +131,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
34570 .cable_detect = slc90e66_cable_detect,
34571 };
34572
34573-static const struct ide_port_info slc90e66_chipset __devinitdata = {
34574+static const struct ide_port_info slc90e66_chipset __devinitconst = {
34575 .name = DRV_NAME,
34576 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
34577 .port_ops = &slc90e66_port_ops,
34578diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
34579index 05a93d6..5f9e325 100644
34580--- a/drivers/ide/tc86c001.c
34581+++ b/drivers/ide/tc86c001.c
34582@@ -190,7 +190,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
34583 .dma_sff_read_status = ide_dma_sff_read_status,
34584 };
34585
34586-static const struct ide_port_info tc86c001_chipset __devinitdata = {
34587+static const struct ide_port_info tc86c001_chipset __devinitconst = {
34588 .name = DRV_NAME,
34589 .init_hwif = init_hwif_tc86c001,
34590 .port_ops = &tc86c001_port_ops,
34591diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
34592index 8773c3b..7907d6c 100644
34593--- a/drivers/ide/triflex.c
34594+++ b/drivers/ide/triflex.c
34595@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
34596 .set_dma_mode = triflex_set_mode,
34597 };
34598
34599-static const struct ide_port_info triflex_device __devinitdata = {
34600+static const struct ide_port_info triflex_device __devinitconst = {
34601 .name = DRV_NAME,
34602 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
34603 .port_ops = &triflex_port_ops,
34604diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
34605index 4b42ca0..e494a98 100644
34606--- a/drivers/ide/trm290.c
34607+++ b/drivers/ide/trm290.c
34608@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
34609 .dma_check = trm290_dma_check,
34610 };
34611
34612-static const struct ide_port_info trm290_chipset __devinitdata = {
34613+static const struct ide_port_info trm290_chipset __devinitconst = {
34614 .name = DRV_NAME,
34615 .init_hwif = init_hwif_trm290,
34616 .tp_ops = &trm290_tp_ops,
34617diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
34618index 028de26..520d5d5 100644
34619--- a/drivers/ide/via82cxxx.c
34620+++ b/drivers/ide/via82cxxx.c
34621@@ -374,7 +374,7 @@ static const struct ide_port_ops via_port_ops = {
34622 .cable_detect = via82cxxx_cable_detect,
34623 };
34624
34625-static const struct ide_port_info via82cxxx_chipset __devinitdata = {
34626+static const struct ide_port_info via82cxxx_chipset __devinitconst = {
34627 .name = DRV_NAME,
34628 .init_chipset = init_chipset_via82cxxx,
34629 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
34630diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
34631index 2cd00b5..14de699 100644
34632--- a/drivers/ieee1394/dv1394.c
34633+++ b/drivers/ieee1394/dv1394.c
34634@@ -739,7 +739,7 @@ static void frame_prepare(struct video_card *video, unsigned int this_frame)
34635 based upon DIF section and sequence
34636 */
34637
34638-static void inline
34639+static inline void
34640 frame_put_packet (struct frame *f, struct packet *p)
34641 {
34642 int section_type = p->data[0] >> 5; /* section type is in bits 5 - 7 */
34643diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
34644index e947d8f..6a966b9 100644
34645--- a/drivers/ieee1394/hosts.c
34646+++ b/drivers/ieee1394/hosts.c
34647@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command,
34648 }
34649
34650 static struct hpsb_host_driver dummy_driver = {
34651+ .name = "dummy",
34652 .transmit_packet = dummy_transmit_packet,
34653 .devctl = dummy_devctl,
34654 .isoctl = dummy_isoctl
34655diff --git a/drivers/ieee1394/init_ohci1394_dma.c b/drivers/ieee1394/init_ohci1394_dma.c
34656index ddaab6e..8d37435 100644
34657--- a/drivers/ieee1394/init_ohci1394_dma.c
34658+++ b/drivers/ieee1394/init_ohci1394_dma.c
34659@@ -257,7 +257,7 @@ void __init init_ohci1394_dma_on_all_controllers(void)
34660 for (func = 0; func < 8; func++) {
34661 u32 class = read_pci_config(num,slot,func,
34662 PCI_CLASS_REVISION);
34663- if ((class == 0xffffffff))
34664+ if (class == 0xffffffff)
34665 continue; /* No device at this func */
34666
34667 if (class>>8 != PCI_CLASS_SERIAL_FIREWIRE_OHCI)
34668diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
34669index 65c1429..5d8c11f 100644
34670--- a/drivers/ieee1394/ohci1394.c
34671+++ b/drivers/ieee1394/ohci1394.c
34672@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_DRIVER_NAME , ## args)
34673 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
34674
34675 /* Module Parameters */
34676-static int phys_dma = 1;
34677+static int phys_dma;
34678 module_param(phys_dma, int, 0444);
34679-MODULE_PARM_DESC(phys_dma, "Enable physical DMA (default = 1).");
34680+MODULE_PARM_DESC(phys_dma, "Enable physical DMA (default = 0).");
34681
34682 static void dma_trm_tasklet(unsigned long data);
34683 static void dma_trm_reset(struct dma_trm_ctx *d);
34684diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
34685index f199896..78c9fc8 100644
34686--- a/drivers/ieee1394/sbp2.c
34687+++ b/drivers/ieee1394/sbp2.c
34688@@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 protocol driver");
34689 MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME);
34690 MODULE_LICENSE("GPL");
34691
34692-static int sbp2_module_init(void)
34693+static int __init sbp2_module_init(void)
34694 {
34695 int ret;
34696
34697diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
34698index a5dea6b..0cefe8f 100644
34699--- a/drivers/infiniband/core/cm.c
34700+++ b/drivers/infiniband/core/cm.c
34701@@ -112,7 +112,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
34702
34703 struct cm_counter_group {
34704 struct kobject obj;
34705- atomic_long_t counter[CM_ATTR_COUNT];
34706+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
34707 };
34708
34709 struct cm_counter_attribute {
34710@@ -1386,7 +1386,7 @@ static void cm_dup_req_handler(struct cm_work *work,
34711 struct ib_mad_send_buf *msg = NULL;
34712 int ret;
34713
34714- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34715+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34716 counter[CM_REQ_COUNTER]);
34717
34718 /* Quick state check to discard duplicate REQs. */
34719@@ -1764,7 +1764,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
34720 if (!cm_id_priv)
34721 return;
34722
34723- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34724+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34725 counter[CM_REP_COUNTER]);
34726 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
34727 if (ret)
34728@@ -1931,7 +1931,7 @@ static int cm_rtu_handler(struct cm_work *work)
34729 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
34730 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
34731 spin_unlock_irq(&cm_id_priv->lock);
34732- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34733+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34734 counter[CM_RTU_COUNTER]);
34735 goto out;
34736 }
34737@@ -2110,7 +2110,7 @@ static int cm_dreq_handler(struct cm_work *work)
34738 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
34739 dreq_msg->local_comm_id);
34740 if (!cm_id_priv) {
34741- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34742+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34743 counter[CM_DREQ_COUNTER]);
34744 cm_issue_drep(work->port, work->mad_recv_wc);
34745 return -EINVAL;
34746@@ -2131,7 +2131,7 @@ static int cm_dreq_handler(struct cm_work *work)
34747 case IB_CM_MRA_REP_RCVD:
34748 break;
34749 case IB_CM_TIMEWAIT:
34750- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34751+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34752 counter[CM_DREQ_COUNTER]);
34753 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
34754 goto unlock;
34755@@ -2145,7 +2145,7 @@ static int cm_dreq_handler(struct cm_work *work)
34756 cm_free_msg(msg);
34757 goto deref;
34758 case IB_CM_DREQ_RCVD:
34759- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34760+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34761 counter[CM_DREQ_COUNTER]);
34762 goto unlock;
34763 default:
34764@@ -2501,7 +2501,7 @@ static int cm_mra_handler(struct cm_work *work)
34765 ib_modify_mad(cm_id_priv->av.port->mad_agent,
34766 cm_id_priv->msg, timeout)) {
34767 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
34768- atomic_long_inc(&work->port->
34769+ atomic_long_inc_unchecked(&work->port->
34770 counter_group[CM_RECV_DUPLICATES].
34771 counter[CM_MRA_COUNTER]);
34772 goto out;
34773@@ -2510,7 +2510,7 @@ static int cm_mra_handler(struct cm_work *work)
34774 break;
34775 case IB_CM_MRA_REQ_RCVD:
34776 case IB_CM_MRA_REP_RCVD:
34777- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34778+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34779 counter[CM_MRA_COUNTER]);
34780 /* fall through */
34781 default:
34782@@ -2672,7 +2672,7 @@ static int cm_lap_handler(struct cm_work *work)
34783 case IB_CM_LAP_IDLE:
34784 break;
34785 case IB_CM_MRA_LAP_SENT:
34786- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34787+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34788 counter[CM_LAP_COUNTER]);
34789 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
34790 goto unlock;
34791@@ -2688,7 +2688,7 @@ static int cm_lap_handler(struct cm_work *work)
34792 cm_free_msg(msg);
34793 goto deref;
34794 case IB_CM_LAP_RCVD:
34795- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34796+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34797 counter[CM_LAP_COUNTER]);
34798 goto unlock;
34799 default:
34800@@ -2972,7 +2972,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
34801 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
34802 if (cur_cm_id_priv) {
34803 spin_unlock_irq(&cm.lock);
34804- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34805+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34806 counter[CM_SIDR_REQ_COUNTER]);
34807 goto out; /* Duplicate message. */
34808 }
34809@@ -3184,10 +3184,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
34810 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
34811 msg->retries = 1;
34812
34813- atomic_long_add(1 + msg->retries,
34814+ atomic_long_add_unchecked(1 + msg->retries,
34815 &port->counter_group[CM_XMIT].counter[attr_index]);
34816 if (msg->retries)
34817- atomic_long_add(msg->retries,
34818+ atomic_long_add_unchecked(msg->retries,
34819 &port->counter_group[CM_XMIT_RETRIES].
34820 counter[attr_index]);
34821
34822@@ -3397,7 +3397,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
34823 }
34824
34825 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
34826- atomic_long_inc(&port->counter_group[CM_RECV].
34827+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
34828 counter[attr_id - CM_ATTR_ID_OFFSET]);
34829
34830 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
34831@@ -3595,10 +3595,10 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
34832 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
34833
34834 return sprintf(buf, "%ld\n",
34835- atomic_long_read(&group->counter[cm_attr->index]));
34836+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
34837 }
34838
34839-static struct sysfs_ops cm_counter_ops = {
34840+static const struct sysfs_ops cm_counter_ops = {
34841 .show = cm_show_counter
34842 };
34843
34844diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
34845index 8fd3a6f..61d8075 100644
34846--- a/drivers/infiniband/core/cma.c
34847+++ b/drivers/infiniband/core/cma.c
34848@@ -2267,6 +2267,9 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,
34849
34850 req.private_data_len = sizeof(struct cma_hdr) +
34851 conn_param->private_data_len;
34852+ if (req.private_data_len < conn_param->private_data_len)
34853+ return -EINVAL;
34854+
34855 req.private_data = kzalloc(req.private_data_len, GFP_ATOMIC);
34856 if (!req.private_data)
34857 return -ENOMEM;
34858@@ -2314,6 +2317,9 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
34859 memset(&req, 0, sizeof req);
34860 offset = cma_user_data_offset(id_priv->id.ps);
34861 req.private_data_len = offset + conn_param->private_data_len;
34862+ if (req.private_data_len < conn_param->private_data_len)
34863+ return -EINVAL;
34864+
34865 private_data = kzalloc(req.private_data_len, GFP_ATOMIC);
34866 if (!private_data)
34867 return -ENOMEM;
34868diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
34869index 4507043..14ad522 100644
34870--- a/drivers/infiniband/core/fmr_pool.c
34871+++ b/drivers/infiniband/core/fmr_pool.c
34872@@ -97,8 +97,8 @@ struct ib_fmr_pool {
34873
34874 struct task_struct *thread;
34875
34876- atomic_t req_ser;
34877- atomic_t flush_ser;
34878+ atomic_unchecked_t req_ser;
34879+ atomic_unchecked_t flush_ser;
34880
34881 wait_queue_head_t force_wait;
34882 };
34883@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
34884 struct ib_fmr_pool *pool = pool_ptr;
34885
34886 do {
34887- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
34888+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
34889 ib_fmr_batch_release(pool);
34890
34891- atomic_inc(&pool->flush_ser);
34892+ atomic_inc_unchecked(&pool->flush_ser);
34893 wake_up_interruptible(&pool->force_wait);
34894
34895 if (pool->flush_function)
34896@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
34897 }
34898
34899 set_current_state(TASK_INTERRUPTIBLE);
34900- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
34901+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
34902 !kthread_should_stop())
34903 schedule();
34904 __set_current_state(TASK_RUNNING);
34905@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
34906 pool->dirty_watermark = params->dirty_watermark;
34907 pool->dirty_len = 0;
34908 spin_lock_init(&pool->pool_lock);
34909- atomic_set(&pool->req_ser, 0);
34910- atomic_set(&pool->flush_ser, 0);
34911+ atomic_set_unchecked(&pool->req_ser, 0);
34912+ atomic_set_unchecked(&pool->flush_ser, 0);
34913 init_waitqueue_head(&pool->force_wait);
34914
34915 pool->thread = kthread_run(ib_fmr_cleanup_thread,
34916@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
34917 }
34918 spin_unlock_irq(&pool->pool_lock);
34919
34920- serial = atomic_inc_return(&pool->req_ser);
34921+ serial = atomic_inc_return_unchecked(&pool->req_ser);
34922 wake_up_process(pool->thread);
34923
34924 if (wait_event_interruptible(pool->force_wait,
34925- atomic_read(&pool->flush_ser) - serial >= 0))
34926+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
34927 return -EINTR;
34928
34929 return 0;
34930@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
34931 } else {
34932 list_add_tail(&fmr->list, &pool->dirty_list);
34933 if (++pool->dirty_len >= pool->dirty_watermark) {
34934- atomic_inc(&pool->req_ser);
34935+ atomic_inc_unchecked(&pool->req_ser);
34936 wake_up_process(pool->thread);
34937 }
34938 }
34939diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
34940index 158a214..1558bb7 100644
34941--- a/drivers/infiniband/core/sysfs.c
34942+++ b/drivers/infiniband/core/sysfs.c
34943@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kobject *kobj,
34944 return port_attr->show(p, port_attr, buf);
34945 }
34946
34947-static struct sysfs_ops port_sysfs_ops = {
34948+static const struct sysfs_ops port_sysfs_ops = {
34949 .show = port_attr_show
34950 };
34951
34952diff --git a/drivers/infiniband/core/uverbs_marshall.c b/drivers/infiniband/core/uverbs_marshall.c
34953index 5440da0..1194ecb 100644
34954--- a/drivers/infiniband/core/uverbs_marshall.c
34955+++ b/drivers/infiniband/core/uverbs_marshall.c
34956@@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_uverbs_ah_attr *dst,
34957 dst->grh.sgid_index = src->grh.sgid_index;
34958 dst->grh.hop_limit = src->grh.hop_limit;
34959 dst->grh.traffic_class = src->grh.traffic_class;
34960+ memset(&dst->grh.reserved, 0, sizeof(dst->grh.reserved));
34961 dst->dlid = src->dlid;
34962 dst->sl = src->sl;
34963 dst->src_path_bits = src->src_path_bits;
34964 dst->static_rate = src->static_rate;
34965 dst->is_global = src->ah_flags & IB_AH_GRH ? 1 : 0;
34966 dst->port_num = src->port_num;
34967+ dst->reserved = 0;
34968 }
34969 EXPORT_SYMBOL(ib_copy_ah_attr_to_user);
34970
34971 void ib_copy_qp_attr_to_user(struct ib_uverbs_qp_attr *dst,
34972 struct ib_qp_attr *src)
34973 {
34974+ dst->qp_state = src->qp_state;
34975 dst->cur_qp_state = src->cur_qp_state;
34976 dst->path_mtu = src->path_mtu;
34977 dst->path_mig_state = src->path_mig_state;
34978@@ -83,6 +86,7 @@ void ib_copy_qp_attr_to_user(struct ib_uverbs_qp_attr *dst,
34979 dst->rnr_retry = src->rnr_retry;
34980 dst->alt_port_num = src->alt_port_num;
34981 dst->alt_timeout = src->alt_timeout;
34982+ memset(dst->reserved, 0, sizeof(dst->reserved));
34983 }
34984 EXPORT_SYMBOL(ib_copy_qp_attr_to_user);
34985
34986diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
34987index 100da85..62e6b88 100644
34988--- a/drivers/infiniband/hw/ipath/ipath_fs.c
34989+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
34990@@ -110,6 +110,8 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf,
34991 struct infinipath_counters counters;
34992 struct ipath_devdata *dd;
34993
34994+ pax_track_stack();
34995+
34996 dd = file->f_path.dentry->d_inode->i_private;
34997 dd->ipath_f_read_counters(dd, &counters);
34998
34999diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
35000index cbde0cf..afaf55c 100644
35001--- a/drivers/infiniband/hw/nes/nes.c
35002+++ b/drivers/infiniband/hw/nes/nes.c
35003@@ -102,7 +102,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
35004 LIST_HEAD(nes_adapter_list);
35005 static LIST_HEAD(nes_dev_list);
35006
35007-atomic_t qps_destroyed;
35008+atomic_unchecked_t qps_destroyed;
35009
35010 static unsigned int ee_flsh_adapter;
35011 static unsigned int sysfs_nonidx_addr;
35012@@ -259,7 +259,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
35013 struct nes_adapter *nesadapter = nesdev->nesadapter;
35014 u32 qp_id;
35015
35016- atomic_inc(&qps_destroyed);
35017+ atomic_inc_unchecked(&qps_destroyed);
35018
35019 /* Free the control structures */
35020
35021diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
35022index bcc6abc..9c76b2f 100644
35023--- a/drivers/infiniband/hw/nes/nes.h
35024+++ b/drivers/infiniband/hw/nes/nes.h
35025@@ -174,17 +174,17 @@ extern unsigned int nes_debug_level;
35026 extern unsigned int wqm_quanta;
35027 extern struct list_head nes_adapter_list;
35028
35029-extern atomic_t cm_connects;
35030-extern atomic_t cm_accepts;
35031-extern atomic_t cm_disconnects;
35032-extern atomic_t cm_closes;
35033-extern atomic_t cm_connecteds;
35034-extern atomic_t cm_connect_reqs;
35035-extern atomic_t cm_rejects;
35036-extern atomic_t mod_qp_timouts;
35037-extern atomic_t qps_created;
35038-extern atomic_t qps_destroyed;
35039-extern atomic_t sw_qps_destroyed;
35040+extern atomic_unchecked_t cm_connects;
35041+extern atomic_unchecked_t cm_accepts;
35042+extern atomic_unchecked_t cm_disconnects;
35043+extern atomic_unchecked_t cm_closes;
35044+extern atomic_unchecked_t cm_connecteds;
35045+extern atomic_unchecked_t cm_connect_reqs;
35046+extern atomic_unchecked_t cm_rejects;
35047+extern atomic_unchecked_t mod_qp_timouts;
35048+extern atomic_unchecked_t qps_created;
35049+extern atomic_unchecked_t qps_destroyed;
35050+extern atomic_unchecked_t sw_qps_destroyed;
35051 extern u32 mh_detected;
35052 extern u32 mh_pauses_sent;
35053 extern u32 cm_packets_sent;
35054@@ -196,11 +196,11 @@ extern u32 cm_packets_retrans;
35055 extern u32 cm_listens_created;
35056 extern u32 cm_listens_destroyed;
35057 extern u32 cm_backlog_drops;
35058-extern atomic_t cm_loopbacks;
35059-extern atomic_t cm_nodes_created;
35060-extern atomic_t cm_nodes_destroyed;
35061-extern atomic_t cm_accel_dropped_pkts;
35062-extern atomic_t cm_resets_recvd;
35063+extern atomic_unchecked_t cm_loopbacks;
35064+extern atomic_unchecked_t cm_nodes_created;
35065+extern atomic_unchecked_t cm_nodes_destroyed;
35066+extern atomic_unchecked_t cm_accel_dropped_pkts;
35067+extern atomic_unchecked_t cm_resets_recvd;
35068
35069 extern u32 int_mod_timer_init;
35070 extern u32 int_mod_cq_depth_256;
35071diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
35072index 73473db..5ed06e8 100644
35073--- a/drivers/infiniband/hw/nes/nes_cm.c
35074+++ b/drivers/infiniband/hw/nes/nes_cm.c
35075@@ -69,11 +69,11 @@ u32 cm_packets_received;
35076 u32 cm_listens_created;
35077 u32 cm_listens_destroyed;
35078 u32 cm_backlog_drops;
35079-atomic_t cm_loopbacks;
35080-atomic_t cm_nodes_created;
35081-atomic_t cm_nodes_destroyed;
35082-atomic_t cm_accel_dropped_pkts;
35083-atomic_t cm_resets_recvd;
35084+atomic_unchecked_t cm_loopbacks;
35085+atomic_unchecked_t cm_nodes_created;
35086+atomic_unchecked_t cm_nodes_destroyed;
35087+atomic_unchecked_t cm_accel_dropped_pkts;
35088+atomic_unchecked_t cm_resets_recvd;
35089
35090 static inline int mini_cm_accelerated(struct nes_cm_core *,
35091 struct nes_cm_node *);
35092@@ -149,13 +149,13 @@ static struct nes_cm_ops nes_cm_api = {
35093
35094 static struct nes_cm_core *g_cm_core;
35095
35096-atomic_t cm_connects;
35097-atomic_t cm_accepts;
35098-atomic_t cm_disconnects;
35099-atomic_t cm_closes;
35100-atomic_t cm_connecteds;
35101-atomic_t cm_connect_reqs;
35102-atomic_t cm_rejects;
35103+atomic_unchecked_t cm_connects;
35104+atomic_unchecked_t cm_accepts;
35105+atomic_unchecked_t cm_disconnects;
35106+atomic_unchecked_t cm_closes;
35107+atomic_unchecked_t cm_connecteds;
35108+atomic_unchecked_t cm_connect_reqs;
35109+atomic_unchecked_t cm_rejects;
35110
35111
35112 /**
35113@@ -1195,7 +1195,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
35114 cm_node->rem_mac);
35115
35116 add_hte_node(cm_core, cm_node);
35117- atomic_inc(&cm_nodes_created);
35118+ atomic_inc_unchecked(&cm_nodes_created);
35119
35120 return cm_node;
35121 }
35122@@ -1253,7 +1253,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
35123 }
35124
35125 atomic_dec(&cm_core->node_cnt);
35126- atomic_inc(&cm_nodes_destroyed);
35127+ atomic_inc_unchecked(&cm_nodes_destroyed);
35128 nesqp = cm_node->nesqp;
35129 if (nesqp) {
35130 nesqp->cm_node = NULL;
35131@@ -1320,7 +1320,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
35132
35133 static void drop_packet(struct sk_buff *skb)
35134 {
35135- atomic_inc(&cm_accel_dropped_pkts);
35136+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
35137 dev_kfree_skb_any(skb);
35138 }
35139
35140@@ -1377,7 +1377,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
35141
35142 int reset = 0; /* whether to send reset in case of err.. */
35143 int passive_state;
35144- atomic_inc(&cm_resets_recvd);
35145+ atomic_inc_unchecked(&cm_resets_recvd);
35146 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
35147 " refcnt=%d\n", cm_node, cm_node->state,
35148 atomic_read(&cm_node->ref_count));
35149@@ -2000,7 +2000,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
35150 rem_ref_cm_node(cm_node->cm_core, cm_node);
35151 return NULL;
35152 }
35153- atomic_inc(&cm_loopbacks);
35154+ atomic_inc_unchecked(&cm_loopbacks);
35155 loopbackremotenode->loopbackpartner = cm_node;
35156 loopbackremotenode->tcp_cntxt.rcv_wscale =
35157 NES_CM_DEFAULT_RCV_WND_SCALE;
35158@@ -2262,7 +2262,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
35159 add_ref_cm_node(cm_node);
35160 } else if (cm_node->state == NES_CM_STATE_TSA) {
35161 rem_ref_cm_node(cm_core, cm_node);
35162- atomic_inc(&cm_accel_dropped_pkts);
35163+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
35164 dev_kfree_skb_any(skb);
35165 break;
35166 }
35167@@ -2568,7 +2568,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
35168
35169 if ((cm_id) && (cm_id->event_handler)) {
35170 if (issue_disconn) {
35171- atomic_inc(&cm_disconnects);
35172+ atomic_inc_unchecked(&cm_disconnects);
35173 cm_event.event = IW_CM_EVENT_DISCONNECT;
35174 cm_event.status = disconn_status;
35175 cm_event.local_addr = cm_id->local_addr;
35176@@ -2590,7 +2590,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
35177 }
35178
35179 if (issue_close) {
35180- atomic_inc(&cm_closes);
35181+ atomic_inc_unchecked(&cm_closes);
35182 nes_disconnect(nesqp, 1);
35183
35184 cm_id->provider_data = nesqp;
35185@@ -2710,7 +2710,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
35186
35187 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
35188 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
35189- atomic_inc(&cm_accepts);
35190+ atomic_inc_unchecked(&cm_accepts);
35191
35192 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
35193 atomic_read(&nesvnic->netdev->refcnt));
35194@@ -2919,7 +2919,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
35195
35196 struct nes_cm_core *cm_core;
35197
35198- atomic_inc(&cm_rejects);
35199+ atomic_inc_unchecked(&cm_rejects);
35200 cm_node = (struct nes_cm_node *) cm_id->provider_data;
35201 loopback = cm_node->loopbackpartner;
35202 cm_core = cm_node->cm_core;
35203@@ -2982,7 +2982,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
35204 ntohl(cm_id->local_addr.sin_addr.s_addr),
35205 ntohs(cm_id->local_addr.sin_port));
35206
35207- atomic_inc(&cm_connects);
35208+ atomic_inc_unchecked(&cm_connects);
35209 nesqp->active_conn = 1;
35210
35211 /* cache the cm_id in the qp */
35212@@ -3195,7 +3195,7 @@ static void cm_event_connected(struct nes_cm_event *event)
35213 if (nesqp->destroyed) {
35214 return;
35215 }
35216- atomic_inc(&cm_connecteds);
35217+ atomic_inc_unchecked(&cm_connecteds);
35218 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
35219 " local port 0x%04X. jiffies = %lu.\n",
35220 nesqp->hwqp.qp_id,
35221@@ -3403,7 +3403,7 @@ static void cm_event_reset(struct nes_cm_event *event)
35222
35223 ret = cm_id->event_handler(cm_id, &cm_event);
35224 cm_id->add_ref(cm_id);
35225- atomic_inc(&cm_closes);
35226+ atomic_inc_unchecked(&cm_closes);
35227 cm_event.event = IW_CM_EVENT_CLOSE;
35228 cm_event.status = IW_CM_EVENT_STATUS_OK;
35229 cm_event.provider_data = cm_id->provider_data;
35230@@ -3439,7 +3439,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
35231 return;
35232 cm_id = cm_node->cm_id;
35233
35234- atomic_inc(&cm_connect_reqs);
35235+ atomic_inc_unchecked(&cm_connect_reqs);
35236 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
35237 cm_node, cm_id, jiffies);
35238
35239@@ -3477,7 +3477,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
35240 return;
35241 cm_id = cm_node->cm_id;
35242
35243- atomic_inc(&cm_connect_reqs);
35244+ atomic_inc_unchecked(&cm_connect_reqs);
35245 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
35246 cm_node, cm_id, jiffies);
35247
35248diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
35249index e593af3..870694a 100644
35250--- a/drivers/infiniband/hw/nes/nes_nic.c
35251+++ b/drivers/infiniband/hw/nes/nes_nic.c
35252@@ -1210,17 +1210,17 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
35253 target_stat_values[++index] = mh_detected;
35254 target_stat_values[++index] = mh_pauses_sent;
35255 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
35256- target_stat_values[++index] = atomic_read(&cm_connects);
35257- target_stat_values[++index] = atomic_read(&cm_accepts);
35258- target_stat_values[++index] = atomic_read(&cm_disconnects);
35259- target_stat_values[++index] = atomic_read(&cm_connecteds);
35260- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
35261- target_stat_values[++index] = atomic_read(&cm_rejects);
35262- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
35263- target_stat_values[++index] = atomic_read(&qps_created);
35264- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
35265- target_stat_values[++index] = atomic_read(&qps_destroyed);
35266- target_stat_values[++index] = atomic_read(&cm_closes);
35267+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
35268+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
35269+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
35270+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
35271+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
35272+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
35273+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
35274+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
35275+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
35276+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
35277+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
35278 target_stat_values[++index] = cm_packets_sent;
35279 target_stat_values[++index] = cm_packets_bounced;
35280 target_stat_values[++index] = cm_packets_created;
35281@@ -1230,11 +1230,11 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
35282 target_stat_values[++index] = cm_listens_created;
35283 target_stat_values[++index] = cm_listens_destroyed;
35284 target_stat_values[++index] = cm_backlog_drops;
35285- target_stat_values[++index] = atomic_read(&cm_loopbacks);
35286- target_stat_values[++index] = atomic_read(&cm_nodes_created);
35287- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
35288- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
35289- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
35290+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
35291+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
35292+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
35293+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
35294+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
35295 target_stat_values[++index] = int_mod_timer_init;
35296 target_stat_values[++index] = int_mod_cq_depth_1;
35297 target_stat_values[++index] = int_mod_cq_depth_4;
35298diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
35299index a680c42..f914deb 100644
35300--- a/drivers/infiniband/hw/nes/nes_verbs.c
35301+++ b/drivers/infiniband/hw/nes/nes_verbs.c
35302@@ -45,9 +45,9 @@
35303
35304 #include <rdma/ib_umem.h>
35305
35306-atomic_t mod_qp_timouts;
35307-atomic_t qps_created;
35308-atomic_t sw_qps_destroyed;
35309+atomic_unchecked_t mod_qp_timouts;
35310+atomic_unchecked_t qps_created;
35311+atomic_unchecked_t sw_qps_destroyed;
35312
35313 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
35314
35315@@ -1240,7 +1240,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
35316 if (init_attr->create_flags)
35317 return ERR_PTR(-EINVAL);
35318
35319- atomic_inc(&qps_created);
35320+ atomic_inc_unchecked(&qps_created);
35321 switch (init_attr->qp_type) {
35322 case IB_QPT_RC:
35323 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
35324@@ -1568,7 +1568,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
35325 struct iw_cm_event cm_event;
35326 int ret;
35327
35328- atomic_inc(&sw_qps_destroyed);
35329+ atomic_inc_unchecked(&sw_qps_destroyed);
35330 nesqp->destroyed = 1;
35331
35332 /* Blow away the connection if it exists. */
35333diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
35334index ac11be0..3883c04 100644
35335--- a/drivers/input/gameport/gameport.c
35336+++ b/drivers/input/gameport/gameport.c
35337@@ -515,13 +515,13 @@ EXPORT_SYMBOL(gameport_set_phys);
35338 */
35339 static void gameport_init_port(struct gameport *gameport)
35340 {
35341- static atomic_t gameport_no = ATOMIC_INIT(0);
35342+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
35343
35344 __module_get(THIS_MODULE);
35345
35346 mutex_init(&gameport->drv_mutex);
35347 device_initialize(&gameport->dev);
35348- dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_return(&gameport_no) - 1);
35349+ dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
35350 gameport->dev.bus = &gameport_bus;
35351 gameport->dev.release = gameport_release_port;
35352 if (gameport->parent)
35353diff --git a/drivers/input/input.c b/drivers/input/input.c
35354index c82ae82..8cfb9cb 100644
35355--- a/drivers/input/input.c
35356+++ b/drivers/input/input.c
35357@@ -1558,7 +1558,7 @@ EXPORT_SYMBOL(input_set_capability);
35358 */
35359 int input_register_device(struct input_dev *dev)
35360 {
35361- static atomic_t input_no = ATOMIC_INIT(0);
35362+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
35363 struct input_handler *handler;
35364 const char *path;
35365 int error;
35366@@ -1585,7 +1585,7 @@ int input_register_device(struct input_dev *dev)
35367 dev->setkeycode = input_default_setkeycode;
35368
35369 dev_set_name(&dev->dev, "input%ld",
35370- (unsigned long) atomic_inc_return(&input_no) - 1);
35371+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
35372
35373 error = device_add(&dev->dev);
35374 if (error)
35375diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
35376index ca13a6b..b032b0c 100644
35377--- a/drivers/input/joystick/sidewinder.c
35378+++ b/drivers/input/joystick/sidewinder.c
35379@@ -30,6 +30,7 @@
35380 #include <linux/kernel.h>
35381 #include <linux/module.h>
35382 #include <linux/slab.h>
35383+#include <linux/sched.h>
35384 #include <linux/init.h>
35385 #include <linux/input.h>
35386 #include <linux/gameport.h>
35387@@ -428,6 +429,8 @@ static int sw_read(struct sw *sw)
35388 unsigned char buf[SW_LENGTH];
35389 int i;
35390
35391+ pax_track_stack();
35392+
35393 i = sw_read_packet(sw->gameport, buf, sw->length, 0);
35394
35395 if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) { /* Broken packet, try to fix */
35396diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
35397index 79e3edc..01412b9 100644
35398--- a/drivers/input/joystick/xpad.c
35399+++ b/drivers/input/joystick/xpad.c
35400@@ -621,7 +621,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
35401
35402 static int xpad_led_probe(struct usb_xpad *xpad)
35403 {
35404- static atomic_t led_seq = ATOMIC_INIT(0);
35405+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
35406 long led_no;
35407 struct xpad_led *led;
35408 struct led_classdev *led_cdev;
35409@@ -634,7 +634,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
35410 if (!led)
35411 return -ENOMEM;
35412
35413- led_no = (long)atomic_inc_return(&led_seq) - 1;
35414+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
35415
35416 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
35417 led->xpad = xpad;
35418diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
35419index 0236f0d..c7327f1 100644
35420--- a/drivers/input/serio/serio.c
35421+++ b/drivers/input/serio/serio.c
35422@@ -527,7 +527,7 @@ static void serio_release_port(struct device *dev)
35423 */
35424 static void serio_init_port(struct serio *serio)
35425 {
35426- static atomic_t serio_no = ATOMIC_INIT(0);
35427+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
35428
35429 __module_get(THIS_MODULE);
35430
35431@@ -536,7 +536,7 @@ static void serio_init_port(struct serio *serio)
35432 mutex_init(&serio->drv_mutex);
35433 device_initialize(&serio->dev);
35434 dev_set_name(&serio->dev, "serio%ld",
35435- (long)atomic_inc_return(&serio_no) - 1);
35436+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
35437 serio->dev.bus = &serio_bus;
35438 serio->dev.release = serio_release_port;
35439 if (serio->parent) {
35440diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
35441index 33dcd8d..2783d25 100644
35442--- a/drivers/isdn/gigaset/common.c
35443+++ b/drivers/isdn/gigaset/common.c
35444@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
35445 cs->commands_pending = 0;
35446 cs->cur_at_seq = 0;
35447 cs->gotfwver = -1;
35448- cs->open_count = 0;
35449+ local_set(&cs->open_count, 0);
35450 cs->dev = NULL;
35451 cs->tty = NULL;
35452 cs->tty_dev = NULL;
35453diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
35454index a2f6125..6a70677 100644
35455--- a/drivers/isdn/gigaset/gigaset.h
35456+++ b/drivers/isdn/gigaset/gigaset.h
35457@@ -34,6 +34,7 @@
35458 #include <linux/tty_driver.h>
35459 #include <linux/list.h>
35460 #include <asm/atomic.h>
35461+#include <asm/local.h>
35462
35463 #define GIG_VERSION {0,5,0,0}
35464 #define GIG_COMPAT {0,4,0,0}
35465@@ -446,7 +447,7 @@ struct cardstate {
35466 spinlock_t cmdlock;
35467 unsigned curlen, cmdbytes;
35468
35469- unsigned open_count;
35470+ local_t open_count;
35471 struct tty_struct *tty;
35472 struct tasklet_struct if_wake_tasklet;
35473 unsigned control_state;
35474diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
35475index b3065b8..c7e8cc9 100644
35476--- a/drivers/isdn/gigaset/interface.c
35477+++ b/drivers/isdn/gigaset/interface.c
35478@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
35479 return -ERESTARTSYS; // FIXME -EINTR?
35480 tty->driver_data = cs;
35481
35482- ++cs->open_count;
35483-
35484- if (cs->open_count == 1) {
35485+ if (local_inc_return(&cs->open_count) == 1) {
35486 spin_lock_irqsave(&cs->lock, flags);
35487 cs->tty = tty;
35488 spin_unlock_irqrestore(&cs->lock, flags);
35489@@ -195,10 +193,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
35490
35491 if (!cs->connected)
35492 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
35493- else if (!cs->open_count)
35494+ else if (!local_read(&cs->open_count))
35495 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35496 else {
35497- if (!--cs->open_count) {
35498+ if (!local_dec_return(&cs->open_count)) {
35499 spin_lock_irqsave(&cs->lock, flags);
35500 cs->tty = NULL;
35501 spin_unlock_irqrestore(&cs->lock, flags);
35502@@ -233,7 +231,7 @@ static int if_ioctl(struct tty_struct *tty, struct file *file,
35503 if (!cs->connected) {
35504 gig_dbg(DEBUG_IF, "not connected");
35505 retval = -ENODEV;
35506- } else if (!cs->open_count)
35507+ } else if (!local_read(&cs->open_count))
35508 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35509 else {
35510 retval = 0;
35511@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
35512 if (!cs->connected) {
35513 gig_dbg(DEBUG_IF, "not connected");
35514 retval = -ENODEV;
35515- } else if (!cs->open_count)
35516+ } else if (!local_read(&cs->open_count))
35517 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35518 else if (cs->mstate != MS_LOCKED) {
35519 dev_warn(cs->dev, "can't write to unlocked device\n");
35520@@ -395,7 +393,7 @@ static int if_write_room(struct tty_struct *tty)
35521 if (!cs->connected) {
35522 gig_dbg(DEBUG_IF, "not connected");
35523 retval = -ENODEV;
35524- } else if (!cs->open_count)
35525+ } else if (!local_read(&cs->open_count))
35526 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35527 else if (cs->mstate != MS_LOCKED) {
35528 dev_warn(cs->dev, "can't write to unlocked device\n");
35529@@ -425,7 +423,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
35530
35531 if (!cs->connected)
35532 gig_dbg(DEBUG_IF, "not connected");
35533- else if (!cs->open_count)
35534+ else if (!local_read(&cs->open_count))
35535 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35536 else if (cs->mstate != MS_LOCKED)
35537 dev_warn(cs->dev, "can't write to unlocked device\n");
35538@@ -453,7 +451,7 @@ static void if_throttle(struct tty_struct *tty)
35539
35540 if (!cs->connected)
35541 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
35542- else if (!cs->open_count)
35543+ else if (!local_read(&cs->open_count))
35544 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35545 else {
35546 //FIXME
35547@@ -478,7 +476,7 @@ static void if_unthrottle(struct tty_struct *tty)
35548
35549 if (!cs->connected)
35550 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
35551- else if (!cs->open_count)
35552+ else if (!local_read(&cs->open_count))
35553 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35554 else {
35555 //FIXME
35556@@ -510,7 +508,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
35557 goto out;
35558 }
35559
35560- if (!cs->open_count) {
35561+ if (!local_read(&cs->open_count)) {
35562 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35563 goto out;
35564 }
35565diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
35566index a7c0083..62a7cb6 100644
35567--- a/drivers/isdn/hardware/avm/b1.c
35568+++ b/drivers/isdn/hardware/avm/b1.c
35569@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
35570 }
35571 if (left) {
35572 if (t4file->user) {
35573- if (copy_from_user(buf, dp, left))
35574+ if (left > sizeof buf || copy_from_user(buf, dp, left))
35575 return -EFAULT;
35576 } else {
35577 memcpy(buf, dp, left);
35578@@ -221,7 +221,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
35579 }
35580 if (left) {
35581 if (config->user) {
35582- if (copy_from_user(buf, dp, left))
35583+ if (left > sizeof buf || copy_from_user(buf, dp, left))
35584 return -EFAULT;
35585 } else {
35586 memcpy(buf, dp, left);
35587diff --git a/drivers/isdn/hardware/eicon/capidtmf.c b/drivers/isdn/hardware/eicon/capidtmf.c
35588index f130724..c373c68 100644
35589--- a/drivers/isdn/hardware/eicon/capidtmf.c
35590+++ b/drivers/isdn/hardware/eicon/capidtmf.c
35591@@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_state *p_state, byte *buffer, word leng
35592 byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT];
35593 short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES];
35594
35595+ pax_track_stack();
35596
35597 if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
35598 {
35599diff --git a/drivers/isdn/hardware/eicon/capifunc.c b/drivers/isdn/hardware/eicon/capifunc.c
35600index 4d425c6..a9be6c4 100644
35601--- a/drivers/isdn/hardware/eicon/capifunc.c
35602+++ b/drivers/isdn/hardware/eicon/capifunc.c
35603@@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
35604 IDI_SYNC_REQ req;
35605 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
35606
35607+ pax_track_stack();
35608+
35609 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
35610
35611 for (x = 0; x < MAX_DESCRIPTORS; x++) {
35612diff --git a/drivers/isdn/hardware/eicon/diddfunc.c b/drivers/isdn/hardware/eicon/diddfunc.c
35613index 3029234..ef0d9e2 100644
35614--- a/drivers/isdn/hardware/eicon/diddfunc.c
35615+++ b/drivers/isdn/hardware/eicon/diddfunc.c
35616@@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
35617 IDI_SYNC_REQ req;
35618 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
35619
35620+ pax_track_stack();
35621+
35622 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
35623
35624 for (x = 0; x < MAX_DESCRIPTORS; x++) {
35625diff --git a/drivers/isdn/hardware/eicon/divasfunc.c b/drivers/isdn/hardware/eicon/divasfunc.c
35626index d36a4c0..11e7d1a 100644
35627--- a/drivers/isdn/hardware/eicon/divasfunc.c
35628+++ b/drivers/isdn/hardware/eicon/divasfunc.c
35629@@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
35630 IDI_SYNC_REQ req;
35631 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
35632
35633+ pax_track_stack();
35634+
35635 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
35636
35637 for (x = 0; x < MAX_DESCRIPTORS; x++) {
35638diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
35639index 85784a7..a19ca98 100644
35640--- a/drivers/isdn/hardware/eicon/divasync.h
35641+++ b/drivers/isdn/hardware/eicon/divasync.h
35642@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
35643 } diva_didd_add_adapter_t;
35644 typedef struct _diva_didd_remove_adapter {
35645 IDI_CALL p_request;
35646-} diva_didd_remove_adapter_t;
35647+} __no_const diva_didd_remove_adapter_t;
35648 typedef struct _diva_didd_read_adapter_array {
35649 void * buffer;
35650 dword length;
35651diff --git a/drivers/isdn/hardware/eicon/idifunc.c b/drivers/isdn/hardware/eicon/idifunc.c
35652index db87d51..7d09acf 100644
35653--- a/drivers/isdn/hardware/eicon/idifunc.c
35654+++ b/drivers/isdn/hardware/eicon/idifunc.c
35655@@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
35656 IDI_SYNC_REQ req;
35657 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
35658
35659+ pax_track_stack();
35660+
35661 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
35662
35663 for (x = 0; x < MAX_DESCRIPTORS; x++) {
35664diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
35665index ae89fb8..0fab299 100644
35666--- a/drivers/isdn/hardware/eicon/message.c
35667+++ b/drivers/isdn/hardware/eicon/message.c
35668@@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci)
35669 dword d;
35670 word w;
35671
35672+ pax_track_stack();
35673+
35674 a = plci->adapter;
35675 Id = ((word)plci->Id<<8)|a->Id;
35676 PUT_WORD(&SS_Ind[4],0x0000);
35677@@ -7484,6 +7486,8 @@ static word add_b1(PLCI *plci, API_PARSE *bp, word b_channel_info,
35678 word j, n, w;
35679 dword d;
35680
35681+ pax_track_stack();
35682+
35683
35684 for(i=0;i<8;i++) bp_parms[i].length = 0;
35685 for(i=0;i<2;i++) global_config[i].length = 0;
35686@@ -7958,6 +7962,8 @@ static word add_b23(PLCI *plci, API_PARSE *bp)
35687 const byte llc3[] = {4,3,2,2,6,6,0};
35688 const byte header[] = {0,2,3,3,0,0,0};
35689
35690+ pax_track_stack();
35691+
35692 for(i=0;i<8;i++) bp_parms[i].length = 0;
35693 for(i=0;i<6;i++) b2_config_parms[i].length = 0;
35694 for(i=0;i<5;i++) b3_config_parms[i].length = 0;
35695@@ -14761,6 +14767,8 @@ static void group_optimization(DIVA_CAPI_ADAPTER * a, PLCI * plci)
35696 word appl_number_group_type[MAX_APPL];
35697 PLCI *auxplci;
35698
35699+ pax_track_stack();
35700+
35701 set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
35702
35703 if(!a->group_optimization_enabled)
35704diff --git a/drivers/isdn/hardware/eicon/mntfunc.c b/drivers/isdn/hardware/eicon/mntfunc.c
35705index a564b75..f3cf8b5 100644
35706--- a/drivers/isdn/hardware/eicon/mntfunc.c
35707+++ b/drivers/isdn/hardware/eicon/mntfunc.c
35708@@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
35709 IDI_SYNC_REQ req;
35710 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
35711
35712+ pax_track_stack();
35713+
35714 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
35715
35716 for (x = 0; x < MAX_DESCRIPTORS; x++) {
35717diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
35718index a3bd163..8956575 100644
35719--- a/drivers/isdn/hardware/eicon/xdi_adapter.h
35720+++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
35721@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
35722 typedef struct _diva_os_idi_adapter_interface {
35723 diva_init_card_proc_t cleanup_adapter_proc;
35724 diva_cmd_card_proc_t cmd_proc;
35725-} diva_os_idi_adapter_interface_t;
35726+} __no_const diva_os_idi_adapter_interface_t;
35727
35728 typedef struct _diva_os_xdi_adapter {
35729 struct list_head link;
35730diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
35731index adb1e8c..21b590b 100644
35732--- a/drivers/isdn/i4l/isdn_common.c
35733+++ b/drivers/isdn/i4l/isdn_common.c
35734@@ -1290,6 +1290,8 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
35735 } iocpar;
35736 void __user *argp = (void __user *)arg;
35737
35738+ pax_track_stack();
35739+
35740 #define name iocpar.name
35741 #define bname iocpar.bname
35742 #define iocts iocpar.iocts
35743diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
35744index 90b56ed..5ed3305 100644
35745--- a/drivers/isdn/i4l/isdn_net.c
35746+++ b/drivers/isdn/i4l/isdn_net.c
35747@@ -1902,7 +1902,7 @@ static int isdn_net_header(struct sk_buff *skb, struct net_device *dev,
35748 {
35749 isdn_net_local *lp = netdev_priv(dev);
35750 unsigned char *p;
35751- ushort len = 0;
35752+ int len = 0;
35753
35754 switch (lp->p_encap) {
35755 case ISDN_NET_ENCAP_ETHER:
35756diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
35757index bf7997a..cf091db 100644
35758--- a/drivers/isdn/icn/icn.c
35759+++ b/drivers/isdn/icn/icn.c
35760@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
35761 if (count > len)
35762 count = len;
35763 if (user) {
35764- if (copy_from_user(msg, buf, count))
35765+ if (count > sizeof msg || copy_from_user(msg, buf, count))
35766 return -EFAULT;
35767 } else
35768 memcpy(msg, buf, count);
35769diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
35770index feb0fa4..f76f830 100644
35771--- a/drivers/isdn/mISDN/socket.c
35772+++ b/drivers/isdn/mISDN/socket.c
35773@@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
35774 if (dev) {
35775 struct mISDN_devinfo di;
35776
35777+ memset(&di, 0, sizeof(di));
35778 di.id = dev->id;
35779 di.Dprotocols = dev->Dprotocols;
35780 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
35781@@ -671,6 +672,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
35782 if (dev) {
35783 struct mISDN_devinfo di;
35784
35785+ memset(&di, 0, sizeof(di));
35786 di.id = dev->id;
35787 di.Dprotocols = dev->Dprotocols;
35788 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
35789diff --git a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c
35790index 485be8b..f0225bc 100644
35791--- a/drivers/isdn/sc/interrupt.c
35792+++ b/drivers/isdn/sc/interrupt.c
35793@@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy, void *card_inst)
35794 }
35795 else if(callid>=0x0000 && callid<=0x7FFF)
35796 {
35797+ int len;
35798+
35799 pr_debug("%s: Got Incoming Call\n",
35800 sc_adapter[card]->devicename);
35801- strcpy(setup.phone,&(rcvmsg.msg_data.byte_array[4]));
35802- strcpy(setup.eazmsn,
35803- sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn);
35804+ len = strlcpy(setup.phone, &(rcvmsg.msg_data.byte_array[4]),
35805+ sizeof(setup.phone));
35806+ if (len >= sizeof(setup.phone))
35807+ continue;
35808+ len = strlcpy(setup.eazmsn,
35809+ sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn,
35810+ sizeof(setup.eazmsn));
35811+ if (len >= sizeof(setup.eazmsn))
35812+ continue;
35813 setup.si1 = 7;
35814 setup.si2 = 0;
35815 setup.plan = 0;
35816@@ -176,7 +184,9 @@ irqreturn_t interrupt_handler(int dummy, void *card_inst)
35817 * Handle a GetMyNumber Rsp
35818 */
35819 if (IS_CE_MESSAGE(rcvmsg,Call,0,GetMyNumber)){
35820- strcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn,rcvmsg.msg_data.byte_array);
35821+ strlcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn,
35822+ rcvmsg.msg_data.byte_array,
35823+ sizeof(rcvmsg.msg_data.byte_array));
35824 continue;
35825 }
35826
35827diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
35828index 8744d24..d1f9a9a 100644
35829--- a/drivers/lguest/core.c
35830+++ b/drivers/lguest/core.c
35831@@ -91,9 +91,17 @@ static __init int map_switcher(void)
35832 * it's worked so far. The end address needs +1 because __get_vm_area
35833 * allocates an extra guard page, so we need space for that.
35834 */
35835+
35836+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
35837+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
35838+ VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
35839+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
35840+#else
35841 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
35842 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
35843 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
35844+#endif
35845+
35846 if (!switcher_vma) {
35847 err = -ENOMEM;
35848 printk("lguest: could not map switcher pages high\n");
35849@@ -118,7 +126,7 @@ static __init int map_switcher(void)
35850 * Now the Switcher is mapped at the right address, we can't fail!
35851 * Copy in the compiled-in Switcher code (from <arch>_switcher.S).
35852 */
35853- memcpy(switcher_vma->addr, start_switcher_text,
35854+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
35855 end_switcher_text - start_switcher_text);
35856
35857 printk(KERN_INFO "lguest: mapped switcher at %p\n",
35858diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
35859index 6ae3888..8b38145 100644
35860--- a/drivers/lguest/x86/core.c
35861+++ b/drivers/lguest/x86/core.c
35862@@ -59,7 +59,7 @@ static struct {
35863 /* Offset from where switcher.S was compiled to where we've copied it */
35864 static unsigned long switcher_offset(void)
35865 {
35866- return SWITCHER_ADDR - (unsigned long)start_switcher_text;
35867+ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
35868 }
35869
35870 /* This cpu's struct lguest_pages. */
35871@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
35872 * These copies are pretty cheap, so we do them unconditionally: */
35873 /* Save the current Host top-level page directory.
35874 */
35875+
35876+#ifdef CONFIG_PAX_PER_CPU_PGD
35877+ pages->state.host_cr3 = read_cr3();
35878+#else
35879 pages->state.host_cr3 = __pa(current->mm->pgd);
35880+#endif
35881+
35882 /*
35883 * Set up the Guest's page tables to see this CPU's pages (and no
35884 * other CPU's pages).
35885@@ -535,7 +541,7 @@ void __init lguest_arch_host_init(void)
35886 * compiled-in switcher code and the high-mapped copy we just made.
35887 */
35888 for (i = 0; i < IDT_ENTRIES; i++)
35889- default_idt_entries[i] += switcher_offset();
35890+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
35891
35892 /*
35893 * Set up the Switcher's per-cpu areas.
35894@@ -618,7 +624,7 @@ void __init lguest_arch_host_init(void)
35895 * it will be undisturbed when we switch. To change %cs and jump we
35896 * need this structure to feed to Intel's "lcall" instruction.
35897 */
35898- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
35899+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
35900 lguest_entry.segment = LGUEST_CS;
35901
35902 /*
35903diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
35904index 40634b0..4f5855e 100644
35905--- a/drivers/lguest/x86/switcher_32.S
35906+++ b/drivers/lguest/x86/switcher_32.S
35907@@ -87,6 +87,7 @@
35908 #include <asm/page.h>
35909 #include <asm/segment.h>
35910 #include <asm/lguest.h>
35911+#include <asm/processor-flags.h>
35912
35913 // We mark the start of the code to copy
35914 // It's placed in .text tho it's never run here
35915@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
35916 // Changes type when we load it: damn Intel!
35917 // For after we switch over our page tables
35918 // That entry will be read-only: we'd crash.
35919+
35920+#ifdef CONFIG_PAX_KERNEXEC
35921+ mov %cr0, %edx
35922+ xor $X86_CR0_WP, %edx
35923+ mov %edx, %cr0
35924+#endif
35925+
35926 movl $(GDT_ENTRY_TSS*8), %edx
35927 ltr %dx
35928
35929@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
35930 // Let's clear it again for our return.
35931 // The GDT descriptor of the Host
35932 // Points to the table after two "size" bytes
35933- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
35934+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
35935 // Clear "used" from type field (byte 5, bit 2)
35936- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
35937+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
35938+
35939+#ifdef CONFIG_PAX_KERNEXEC
35940+ mov %cr0, %eax
35941+ xor $X86_CR0_WP, %eax
35942+ mov %eax, %cr0
35943+#endif
35944
35945 // Once our page table's switched, the Guest is live!
35946 // The Host fades as we run this final step.
35947@@ -295,13 +309,12 @@ deliver_to_host:
35948 // I consulted gcc, and it gave
35949 // These instructions, which I gladly credit:
35950 leal (%edx,%ebx,8), %eax
35951- movzwl (%eax),%edx
35952- movl 4(%eax), %eax
35953- xorw %ax, %ax
35954- orl %eax, %edx
35955+ movl 4(%eax), %edx
35956+ movw (%eax), %dx
35957 // Now the address of the handler's in %edx
35958 // We call it now: its "iret" drops us home.
35959- jmp *%edx
35960+ ljmp $__KERNEL_CS, $1f
35961+1: jmp *%edx
35962
35963 // Every interrupt can come to us here
35964 // But we must truly tell each apart.
35965diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
35966index 588a5b0..b71db89 100644
35967--- a/drivers/macintosh/macio_asic.c
35968+++ b/drivers/macintosh/macio_asic.c
35969@@ -701,7 +701,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
35970 * MacIO is matched against any Apple ID, it's probe() function
35971 * will then decide wether it applies or not
35972 */
35973-static const struct pci_device_id __devinitdata pci_ids [] = { {
35974+static const struct pci_device_id __devinitconst pci_ids [] = { {
35975 .vendor = PCI_VENDOR_ID_APPLE,
35976 .device = PCI_ANY_ID,
35977 .subvendor = PCI_ANY_ID,
35978diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c
35979index a348bb0..ecd9b3f 100644
35980--- a/drivers/macintosh/via-pmu-backlight.c
35981+++ b/drivers/macintosh/via-pmu-backlight.c
35982@@ -15,7 +15,7 @@
35983
35984 #define MAX_PMU_LEVEL 0xFF
35985
35986-static struct backlight_ops pmu_backlight_data;
35987+static const struct backlight_ops pmu_backlight_data;
35988 static DEFINE_SPINLOCK(pmu_backlight_lock);
35989 static int sleeping, uses_pmu_bl;
35990 static u8 bl_curve[FB_BACKLIGHT_LEVELS];
35991@@ -115,7 +115,7 @@ static int pmu_backlight_get_brightness(struct backlight_device *bd)
35992 return bd->props.brightness;
35993 }
35994
35995-static struct backlight_ops pmu_backlight_data = {
35996+static const struct backlight_ops pmu_backlight_data = {
35997 .get_brightness = pmu_backlight_get_brightness,
35998 .update_status = pmu_backlight_update_status,
35999
36000diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
36001index 6f308a4..b5f7ff7 100644
36002--- a/drivers/macintosh/via-pmu.c
36003+++ b/drivers/macintosh/via-pmu.c
36004@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state_t state)
36005 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
36006 }
36007
36008-static struct platform_suspend_ops pmu_pm_ops = {
36009+static const struct platform_suspend_ops pmu_pm_ops = {
36010 .enter = powerbook_sleep,
36011 .valid = pmu_sleep_valid,
36012 };
36013diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
36014index 818b617..4656e38 100644
36015--- a/drivers/md/dm-ioctl.c
36016+++ b/drivers/md/dm-ioctl.c
36017@@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
36018 cmd == DM_LIST_VERSIONS_CMD)
36019 return 0;
36020
36021- if ((cmd == DM_DEV_CREATE_CMD)) {
36022+ if (cmd == DM_DEV_CREATE_CMD) {
36023 if (!*param->name) {
36024 DMWARN("name not supplied when creating device");
36025 return -EINVAL;
36026diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
36027index 6021d0a..a878643 100644
36028--- a/drivers/md/dm-raid1.c
36029+++ b/drivers/md/dm-raid1.c
36030@@ -41,7 +41,7 @@ enum dm_raid1_error {
36031
36032 struct mirror {
36033 struct mirror_set *ms;
36034- atomic_t error_count;
36035+ atomic_unchecked_t error_count;
36036 unsigned long error_type;
36037 struct dm_dev *dev;
36038 sector_t offset;
36039@@ -203,7 +203,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
36040 * simple way to tell if a device has encountered
36041 * errors.
36042 */
36043- atomic_inc(&m->error_count);
36044+ atomic_inc_unchecked(&m->error_count);
36045
36046 if (test_and_set_bit(error_type, &m->error_type))
36047 return;
36048@@ -225,7 +225,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
36049 }
36050
36051 for (new = ms->mirror; new < ms->mirror + ms->nr_mirrors; new++)
36052- if (!atomic_read(&new->error_count)) {
36053+ if (!atomic_read_unchecked(&new->error_count)) {
36054 set_default_mirror(new);
36055 break;
36056 }
36057@@ -363,7 +363,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
36058 struct mirror *m = get_default_mirror(ms);
36059
36060 do {
36061- if (likely(!atomic_read(&m->error_count)))
36062+ if (likely(!atomic_read_unchecked(&m->error_count)))
36063 return m;
36064
36065 if (m-- == ms->mirror)
36066@@ -377,7 +377,7 @@ static int default_ok(struct mirror *m)
36067 {
36068 struct mirror *default_mirror = get_default_mirror(m->ms);
36069
36070- return !atomic_read(&default_mirror->error_count);
36071+ return !atomic_read_unchecked(&default_mirror->error_count);
36072 }
36073
36074 static int mirror_available(struct mirror_set *ms, struct bio *bio)
36075@@ -484,7 +484,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
36076 */
36077 if (likely(region_in_sync(ms, region, 1)))
36078 m = choose_mirror(ms, bio->bi_sector);
36079- else if (m && atomic_read(&m->error_count))
36080+ else if (m && atomic_read_unchecked(&m->error_count))
36081 m = NULL;
36082
36083 if (likely(m))
36084@@ -855,7 +855,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
36085 }
36086
36087 ms->mirror[mirror].ms = ms;
36088- atomic_set(&(ms->mirror[mirror].error_count), 0);
36089+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
36090 ms->mirror[mirror].error_type = 0;
36091 ms->mirror[mirror].offset = offset;
36092
36093@@ -1241,7 +1241,7 @@ static void mirror_resume(struct dm_target *ti)
36094 */
36095 static char device_status_char(struct mirror *m)
36096 {
36097- if (!atomic_read(&(m->error_count)))
36098+ if (!atomic_read_unchecked(&(m->error_count)))
36099 return 'A';
36100
36101 return (test_bit(DM_RAID1_WRITE_ERROR, &(m->error_type))) ? 'D' :
36102diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
36103index bd58703..9f26571 100644
36104--- a/drivers/md/dm-stripe.c
36105+++ b/drivers/md/dm-stripe.c
36106@@ -20,7 +20,7 @@ struct stripe {
36107 struct dm_dev *dev;
36108 sector_t physical_start;
36109
36110- atomic_t error_count;
36111+ atomic_unchecked_t error_count;
36112 };
36113
36114 struct stripe_c {
36115@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
36116 kfree(sc);
36117 return r;
36118 }
36119- atomic_set(&(sc->stripe[i].error_count), 0);
36120+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
36121 }
36122
36123 ti->private = sc;
36124@@ -257,7 +257,7 @@ static int stripe_status(struct dm_target *ti,
36125 DMEMIT("%d ", sc->stripes);
36126 for (i = 0; i < sc->stripes; i++) {
36127 DMEMIT("%s ", sc->stripe[i].dev->name);
36128- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
36129+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
36130 'D' : 'A';
36131 }
36132 buffer[i] = '\0';
36133@@ -304,8 +304,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
36134 */
36135 for (i = 0; i < sc->stripes; i++)
36136 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
36137- atomic_inc(&(sc->stripe[i].error_count));
36138- if (atomic_read(&(sc->stripe[i].error_count)) <
36139+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
36140+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
36141 DM_IO_ERROR_THRESHOLD)
36142 queue_work(kstriped, &sc->kstriped_ws);
36143 }
36144diff --git a/drivers/md/dm-sysfs.c b/drivers/md/dm-sysfs.c
36145index 4b04590..13a77b2 100644
36146--- a/drivers/md/dm-sysfs.c
36147+++ b/drivers/md/dm-sysfs.c
36148@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
36149 NULL,
36150 };
36151
36152-static struct sysfs_ops dm_sysfs_ops = {
36153+static const struct sysfs_ops dm_sysfs_ops = {
36154 .show = dm_attr_show,
36155 };
36156
36157diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
36158index 03345bb..332250d 100644
36159--- a/drivers/md/dm-table.c
36160+++ b/drivers/md/dm-table.c
36161@@ -376,7 +376,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
36162 if (!dev_size)
36163 return 0;
36164
36165- if ((start >= dev_size) || (start + len > dev_size)) {
36166+ if ((start >= dev_size) || (len > dev_size - start)) {
36167 DMWARN("%s: %s too small for target: "
36168 "start=%llu, len=%llu, dev_size=%llu",
36169 dm_device_name(ti->table->md), bdevname(bdev, b),
36170diff --git a/drivers/md/dm.c b/drivers/md/dm.c
36171index c988ac2..c418141 100644
36172--- a/drivers/md/dm.c
36173+++ b/drivers/md/dm.c
36174@@ -165,9 +165,9 @@ struct mapped_device {
36175 /*
36176 * Event handling.
36177 */
36178- atomic_t event_nr;
36179+ atomic_unchecked_t event_nr;
36180 wait_queue_head_t eventq;
36181- atomic_t uevent_seq;
36182+ atomic_unchecked_t uevent_seq;
36183 struct list_head uevent_list;
36184 spinlock_t uevent_lock; /* Protect access to uevent_list */
36185
36186@@ -1776,8 +1776,8 @@ static struct mapped_device *alloc_dev(int minor)
36187 rwlock_init(&md->map_lock);
36188 atomic_set(&md->holders, 1);
36189 atomic_set(&md->open_count, 0);
36190- atomic_set(&md->event_nr, 0);
36191- atomic_set(&md->uevent_seq, 0);
36192+ atomic_set_unchecked(&md->event_nr, 0);
36193+ atomic_set_unchecked(&md->uevent_seq, 0);
36194 INIT_LIST_HEAD(&md->uevent_list);
36195 spin_lock_init(&md->uevent_lock);
36196
36197@@ -1927,7 +1927,7 @@ static void event_callback(void *context)
36198
36199 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
36200
36201- atomic_inc(&md->event_nr);
36202+ atomic_inc_unchecked(&md->event_nr);
36203 wake_up(&md->eventq);
36204 }
36205
36206@@ -2562,18 +2562,18 @@ void dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
36207
36208 uint32_t dm_next_uevent_seq(struct mapped_device *md)
36209 {
36210- return atomic_add_return(1, &md->uevent_seq);
36211+ return atomic_add_return_unchecked(1, &md->uevent_seq);
36212 }
36213
36214 uint32_t dm_get_event_nr(struct mapped_device *md)
36215 {
36216- return atomic_read(&md->event_nr);
36217+ return atomic_read_unchecked(&md->event_nr);
36218 }
36219
36220 int dm_wait_event(struct mapped_device *md, int event_nr)
36221 {
36222 return wait_event_interruptible(md->eventq,
36223- (event_nr != atomic_read(&md->event_nr)));
36224+ (event_nr != atomic_read_unchecked(&md->event_nr)));
36225 }
36226
36227 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
36228diff --git a/drivers/md/md.c b/drivers/md/md.c
36229index 4ce6e2f..7a9530a 100644
36230--- a/drivers/md/md.c
36231+++ b/drivers/md/md.c
36232@@ -153,10 +153,10 @@ static int start_readonly;
36233 * start build, activate spare
36234 */
36235 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
36236-static atomic_t md_event_count;
36237+static atomic_unchecked_t md_event_count;
36238 void md_new_event(mddev_t *mddev)
36239 {
36240- atomic_inc(&md_event_count);
36241+ atomic_inc_unchecked(&md_event_count);
36242 wake_up(&md_event_waiters);
36243 }
36244 EXPORT_SYMBOL_GPL(md_new_event);
36245@@ -166,7 +166,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
36246 */
36247 static void md_new_event_inintr(mddev_t *mddev)
36248 {
36249- atomic_inc(&md_event_count);
36250+ atomic_inc_unchecked(&md_event_count);
36251 wake_up(&md_event_waiters);
36252 }
36253
36254@@ -1226,7 +1226,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)
36255
36256 rdev->preferred_minor = 0xffff;
36257 rdev->data_offset = le64_to_cpu(sb->data_offset);
36258- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
36259+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
36260
36261 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
36262 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
36263@@ -1400,7 +1400,7 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)
36264 else
36265 sb->resync_offset = cpu_to_le64(0);
36266
36267- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
36268+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
36269
36270 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
36271 sb->size = cpu_to_le64(mddev->dev_sectors);
36272@@ -2222,7 +2222,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
36273 static ssize_t
36274 errors_show(mdk_rdev_t *rdev, char *page)
36275 {
36276- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
36277+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
36278 }
36279
36280 static ssize_t
36281@@ -2231,7 +2231,7 @@ errors_store(mdk_rdev_t *rdev, const char *buf, size_t len)
36282 char *e;
36283 unsigned long n = simple_strtoul(buf, &e, 10);
36284 if (*buf && (*e == 0 || *e == '\n')) {
36285- atomic_set(&rdev->corrected_errors, n);
36286+ atomic_set_unchecked(&rdev->corrected_errors, n);
36287 return len;
36288 }
36289 return -EINVAL;
36290@@ -2525,7 +2525,7 @@ static void rdev_free(struct kobject *ko)
36291 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
36292 kfree(rdev);
36293 }
36294-static struct sysfs_ops rdev_sysfs_ops = {
36295+static const struct sysfs_ops rdev_sysfs_ops = {
36296 .show = rdev_attr_show,
36297 .store = rdev_attr_store,
36298 };
36299@@ -2574,8 +2574,8 @@ static mdk_rdev_t *md_import_device(dev_t newdev, int super_format, int super_mi
36300 rdev->data_offset = 0;
36301 rdev->sb_events = 0;
36302 atomic_set(&rdev->nr_pending, 0);
36303- atomic_set(&rdev->read_errors, 0);
36304- atomic_set(&rdev->corrected_errors, 0);
36305+ atomic_set_unchecked(&rdev->read_errors, 0);
36306+ atomic_set_unchecked(&rdev->corrected_errors, 0);
36307
36308 size = rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS;
36309 if (!size) {
36310@@ -3895,7 +3895,7 @@ static void md_free(struct kobject *ko)
36311 kfree(mddev);
36312 }
36313
36314-static struct sysfs_ops md_sysfs_ops = {
36315+static const struct sysfs_ops md_sysfs_ops = {
36316 .show = md_attr_show,
36317 .store = md_attr_store,
36318 };
36319@@ -4482,7 +4482,8 @@ out:
36320 err = 0;
36321 blk_integrity_unregister(disk);
36322 md_new_event(mddev);
36323- sysfs_notify_dirent(mddev->sysfs_state);
36324+ if (mddev->sysfs_state)
36325+ sysfs_notify_dirent(mddev->sysfs_state);
36326 return err;
36327 }
36328
36329@@ -5962,7 +5963,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
36330
36331 spin_unlock(&pers_lock);
36332 seq_printf(seq, "\n");
36333- mi->event = atomic_read(&md_event_count);
36334+ mi->event = atomic_read_unchecked(&md_event_count);
36335 return 0;
36336 }
36337 if (v == (void*)2) {
36338@@ -6051,7 +6052,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
36339 chunk_kb ? "KB" : "B");
36340 if (bitmap->file) {
36341 seq_printf(seq, ", file: ");
36342- seq_path(seq, &bitmap->file->f_path, " \t\n");
36343+ seq_path(seq, &bitmap->file->f_path, " \t\n\\");
36344 }
36345
36346 seq_printf(seq, "\n");
36347@@ -6085,7 +6086,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
36348 else {
36349 struct seq_file *p = file->private_data;
36350 p->private = mi;
36351- mi->event = atomic_read(&md_event_count);
36352+ mi->event = atomic_read_unchecked(&md_event_count);
36353 }
36354 return error;
36355 }
36356@@ -6101,7 +6102,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
36357 /* always allow read */
36358 mask = POLLIN | POLLRDNORM;
36359
36360- if (mi->event != atomic_read(&md_event_count))
36361+ if (mi->event != atomic_read_unchecked(&md_event_count))
36362 mask |= POLLERR | POLLPRI;
36363 return mask;
36364 }
36365@@ -6145,7 +6146,7 @@ static int is_mddev_idle(mddev_t *mddev, int init)
36366 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
36367 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
36368 (int)part_stat_read(&disk->part0, sectors[1]) -
36369- atomic_read(&disk->sync_io);
36370+ atomic_read_unchecked(&disk->sync_io);
36371 /* sync IO will cause sync_io to increase before the disk_stats
36372 * as sync_io is counted when a request starts, and
36373 * disk_stats is counted when it completes.
36374diff --git a/drivers/md/md.h b/drivers/md/md.h
36375index 87430fe..0024a4c 100644
36376--- a/drivers/md/md.h
36377+++ b/drivers/md/md.h
36378@@ -94,10 +94,10 @@ struct mdk_rdev_s
36379 * only maintained for arrays that
36380 * support hot removal
36381 */
36382- atomic_t read_errors; /* number of consecutive read errors that
36383+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
36384 * we have tried to ignore.
36385 */
36386- atomic_t corrected_errors; /* number of corrected read errors,
36387+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
36388 * for reporting to userspace and storing
36389 * in superblock.
36390 */
36391@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_rdev_t *rdev, mddev_t *mddev)
36392
36393 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
36394 {
36395- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
36396+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
36397 }
36398
36399 struct mdk_personality
36400diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
36401index 968cb14..f0ad2e4 100644
36402--- a/drivers/md/raid1.c
36403+++ b/drivers/md/raid1.c
36404@@ -1415,7 +1415,7 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
36405 if (r1_bio->bios[d]->bi_end_io != end_sync_read)
36406 continue;
36407 rdev = conf->mirrors[d].rdev;
36408- atomic_add(s, &rdev->corrected_errors);
36409+ atomic_add_unchecked(s, &rdev->corrected_errors);
36410 if (sync_page_io(rdev->bdev,
36411 sect + rdev->data_offset,
36412 s<<9,
36413@@ -1564,7 +1564,7 @@ static void fix_read_error(conf_t *conf, int read_disk,
36414 /* Well, this device is dead */
36415 md_error(mddev, rdev);
36416 else {
36417- atomic_add(s, &rdev->corrected_errors);
36418+ atomic_add_unchecked(s, &rdev->corrected_errors);
36419 printk(KERN_INFO
36420 "raid1:%s: read error corrected "
36421 "(%d sectors at %llu on %s)\n",
36422diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
36423index 1b4e232..cf0f534 100644
36424--- a/drivers/md/raid10.c
36425+++ b/drivers/md/raid10.c
36426@@ -1255,7 +1255,7 @@ static void end_sync_read(struct bio *bio, int error)
36427 if (test_bit(BIO_UPTODATE, &bio->bi_flags))
36428 set_bit(R10BIO_Uptodate, &r10_bio->state);
36429 else {
36430- atomic_add(r10_bio->sectors,
36431+ atomic_add_unchecked(r10_bio->sectors,
36432 &conf->mirrors[d].rdev->corrected_errors);
36433 if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery))
36434 md_error(r10_bio->mddev,
36435@@ -1520,7 +1520,7 @@ static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio)
36436 test_bit(In_sync, &rdev->flags)) {
36437 atomic_inc(&rdev->nr_pending);
36438 rcu_read_unlock();
36439- atomic_add(s, &rdev->corrected_errors);
36440+ atomic_add_unchecked(s, &rdev->corrected_errors);
36441 if (sync_page_io(rdev->bdev,
36442 r10_bio->devs[sl].addr +
36443 sect + rdev->data_offset,
36444diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
36445index 883215d..675bf47 100644
36446--- a/drivers/md/raid5.c
36447+++ b/drivers/md/raid5.c
36448@@ -482,7 +482,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
36449 bi->bi_next = NULL;
36450 if ((rw & WRITE) &&
36451 test_bit(R5_ReWrite, &sh->dev[i].flags))
36452- atomic_add(STRIPE_SECTORS,
36453+ atomic_add_unchecked(STRIPE_SECTORS,
36454 &rdev->corrected_errors);
36455 generic_make_request(bi);
36456 } else {
36457@@ -1517,15 +1517,15 @@ static void raid5_end_read_request(struct bio * bi, int error)
36458 clear_bit(R5_ReadError, &sh->dev[i].flags);
36459 clear_bit(R5_ReWrite, &sh->dev[i].flags);
36460 }
36461- if (atomic_read(&conf->disks[i].rdev->read_errors))
36462- atomic_set(&conf->disks[i].rdev->read_errors, 0);
36463+ if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors))
36464+ atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0);
36465 } else {
36466 const char *bdn = bdevname(conf->disks[i].rdev->bdev, b);
36467 int retry = 0;
36468 rdev = conf->disks[i].rdev;
36469
36470 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
36471- atomic_inc(&rdev->read_errors);
36472+ atomic_inc_unchecked(&rdev->read_errors);
36473 if (conf->mddev->degraded >= conf->max_degraded)
36474 printk_rl(KERN_WARNING
36475 "raid5:%s: read error not correctable "
36476@@ -1543,7 +1543,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
36477 (unsigned long long)(sh->sector
36478 + rdev->data_offset),
36479 bdn);
36480- else if (atomic_read(&rdev->read_errors)
36481+ else if (atomic_read_unchecked(&rdev->read_errors)
36482 > conf->max_nr_stripes)
36483 printk(KERN_WARNING
36484 "raid5:%s: Too many read errors, failing device %s.\n",
36485@@ -1870,6 +1870,7 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i, int previous)
36486 sector_t r_sector;
36487 struct stripe_head sh2;
36488
36489+ pax_track_stack();
36490
36491 chunk_offset = sector_div(new_sector, sectors_per_chunk);
36492 stripe = new_sector;
36493diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c
36494index 05bde9c..2f31d40 100644
36495--- a/drivers/media/common/saa7146_hlp.c
36496+++ b/drivers/media/common/saa7146_hlp.c
36497@@ -353,6 +353,8 @@ static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct sa
36498
36499 int x[32], y[32], w[32], h[32];
36500
36501+ pax_track_stack();
36502+
36503 /* clear out memory */
36504 memset(&line_list[0], 0x00, sizeof(u32)*32);
36505 memset(&pixel_list[0], 0x00, sizeof(u32)*32);
36506diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
36507index cb22da5..82b686e 100644
36508--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
36509+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
36510@@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot, u8 * eb
36511 u8 buf[HOST_LINK_BUF_SIZE];
36512 int i;
36513
36514+ pax_track_stack();
36515+
36516 dprintk("%s\n", __func__);
36517
36518 /* check if we have space for a link buf in the rx_buffer */
36519@@ -1285,6 +1287,8 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file,
36520 unsigned long timeout;
36521 int written;
36522
36523+ pax_track_stack();
36524+
36525 dprintk("%s\n", __func__);
36526
36527 /* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
36528diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
36529index 2fe05d0..a3289c4 100644
36530--- a/drivers/media/dvb/dvb-core/dvb_demux.h
36531+++ b/drivers/media/dvb/dvb-core/dvb_demux.h
36532@@ -71,7 +71,7 @@ struct dvb_demux_feed {
36533 union {
36534 dmx_ts_cb ts;
36535 dmx_section_cb sec;
36536- } cb;
36537+ } __no_const cb;
36538
36539 struct dvb_demux *demux;
36540 void *priv;
36541diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
36542index 94159b9..376bd8e 100644
36543--- a/drivers/media/dvb/dvb-core/dvbdev.c
36544+++ b/drivers/media/dvb/dvb-core/dvbdev.c
36545@@ -191,7 +191,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
36546 const struct dvb_device *template, void *priv, int type)
36547 {
36548 struct dvb_device *dvbdev;
36549- struct file_operations *dvbdevfops;
36550+ file_operations_no_const *dvbdevfops;
36551 struct device *clsdev;
36552 int minor;
36553 int id;
36554diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
36555index 2a53dd0..db8c07a 100644
36556--- a/drivers/media/dvb/dvb-usb/cxusb.c
36557+++ b/drivers/media/dvb/dvb-usb/cxusb.c
36558@@ -1040,7 +1040,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
36559 struct dib0700_adapter_state {
36560 int (*set_param_save) (struct dvb_frontend *,
36561 struct dvb_frontend_parameters *);
36562-};
36563+} __no_const;
36564
36565 static int dib7070_set_param_override(struct dvb_frontend *fe,
36566 struct dvb_frontend_parameters *fep)
36567diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
36568index db7f7f7..f55e96f 100644
36569--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
36570+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
36571@@ -332,6 +332,8 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw
36572
36573 u8 buf[260];
36574
36575+ pax_track_stack();
36576+
36577 while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) {
36578 deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",hx.addr, hx.len, hx.chk);
36579
36580diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
36581index 524acf5..5ffc403 100644
36582--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
36583+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
36584@@ -28,7 +28,7 @@ MODULE_PARM_DESC(force_lna_activation, "force the activation of Low-Noise-Amplif
36585
36586 struct dib0700_adapter_state {
36587 int (*set_param_save) (struct dvb_frontend *, struct dvb_frontend_parameters *);
36588-};
36589+} __no_const;
36590
36591 /* Hauppauge Nova-T 500 (aka Bristol)
36592 * has a LNA on GPIO0 which is enabled by setting 1 */
36593diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
36594index ba91735..4261d84 100644
36595--- a/drivers/media/dvb/frontends/dib3000.h
36596+++ b/drivers/media/dvb/frontends/dib3000.h
36597@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
36598 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
36599 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
36600 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
36601-};
36602+} __no_const;
36603
36604 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
36605 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
36606diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
36607index c709ce6..b3fe620 100644
36608--- a/drivers/media/dvb/frontends/or51211.c
36609+++ b/drivers/media/dvb/frontends/or51211.c
36610@@ -113,6 +113,8 @@ static int or51211_load_firmware (struct dvb_frontend* fe,
36611 u8 tudata[585];
36612 int i;
36613
36614+ pax_track_stack();
36615+
36616 dprintk("Firmware is %zd bytes\n",fw->size);
36617
36618 /* Get eprom data */
36619diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
36620index 482d0f3..ee1e202 100644
36621--- a/drivers/media/radio/radio-cadet.c
36622+++ b/drivers/media/radio/radio-cadet.c
36623@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
36624 while (i < count && dev->rdsin != dev->rdsout)
36625 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
36626
36627- if (copy_to_user(data, readbuf, i))
36628+ if (i > sizeof readbuf || copy_to_user(data, readbuf, i))
36629 return -EFAULT;
36630 return i;
36631 }
36632diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
36633index 6dd51e2..0359b92 100644
36634--- a/drivers/media/video/cx18/cx18-driver.c
36635+++ b/drivers/media/video/cx18/cx18-driver.c
36636@@ -56,7 +56,7 @@ static struct pci_device_id cx18_pci_tbl[] __devinitdata = {
36637
36638 MODULE_DEVICE_TABLE(pci, cx18_pci_tbl);
36639
36640-static atomic_t cx18_instance = ATOMIC_INIT(0);
36641+static atomic_unchecked_t cx18_instance = ATOMIC_INIT(0);
36642
36643 /* Parameter declarations */
36644 static int cardtype[CX18_MAX_CARDS];
36645@@ -288,6 +288,8 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
36646 struct i2c_client c;
36647 u8 eedata[256];
36648
36649+ pax_track_stack();
36650+
36651 memset(&c, 0, sizeof(c));
36652 strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
36653 c.adapter = &cx->i2c_adap[0];
36654@@ -800,7 +802,7 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
36655 struct cx18 *cx;
36656
36657 /* FIXME - module parameter arrays constrain max instances */
36658- i = atomic_inc_return(&cx18_instance) - 1;
36659+ i = atomic_inc_return_unchecked(&cx18_instance) - 1;
36660 if (i >= CX18_MAX_CARDS) {
36661 printk(KERN_ERR "cx18: cannot manage card %d, driver has a "
36662 "limit of 0 - %d\n", i, CX18_MAX_CARDS - 1);
36663diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
36664index 463ec34..2f4625a 100644
36665--- a/drivers/media/video/ivtv/ivtv-driver.c
36666+++ b/drivers/media/video/ivtv/ivtv-driver.c
36667@@ -79,7 +79,7 @@ static struct pci_device_id ivtv_pci_tbl[] __devinitdata = {
36668 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
36669
36670 /* ivtv instance counter */
36671-static atomic_t ivtv_instance = ATOMIC_INIT(0);
36672+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
36673
36674 /* Parameter declarations */
36675 static int cardtype[IVTV_MAX_CARDS];
36676diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
36677index 5fc4ac0..652a54a 100644
36678--- a/drivers/media/video/omap24xxcam.c
36679+++ b/drivers/media/video/omap24xxcam.c
36680@@ -401,7 +401,7 @@ static void omap24xxcam_vbq_complete(struct omap24xxcam_sgdma *sgdma,
36681 spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags);
36682
36683 do_gettimeofday(&vb->ts);
36684- vb->field_count = atomic_add_return(2, &fh->field_count);
36685+ vb->field_count = atomic_add_return_unchecked(2, &fh->field_count);
36686 if (csr & csr_error) {
36687 vb->state = VIDEOBUF_ERROR;
36688 if (!atomic_read(&fh->cam->in_reset)) {
36689diff --git a/drivers/media/video/omap24xxcam.h b/drivers/media/video/omap24xxcam.h
36690index 2ce67f5..cf26a5b 100644
36691--- a/drivers/media/video/omap24xxcam.h
36692+++ b/drivers/media/video/omap24xxcam.h
36693@@ -533,7 +533,7 @@ struct omap24xxcam_fh {
36694 spinlock_t vbq_lock; /* spinlock for the videobuf queue */
36695 struct videobuf_queue vbq;
36696 struct v4l2_pix_format pix; /* serialise pix by vbq->lock */
36697- atomic_t field_count; /* field counter for videobuf_buffer */
36698+ atomic_unchecked_t field_count; /* field counter for videobuf_buffer */
36699 /* accessing cam here doesn't need serialisation: it's constant */
36700 struct omap24xxcam_device *cam;
36701 };
36702diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
36703index 299afa4..eb47459 100644
36704--- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
36705+++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
36706@@ -119,6 +119,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw *hdw)
36707 u8 *eeprom;
36708 struct tveeprom tvdata;
36709
36710+ pax_track_stack();
36711+
36712 memset(&tvdata,0,sizeof(tvdata));
36713
36714 eeprom = pvr2_eeprom_fetch(hdw);
36715diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
36716index 5b152ff..3320638 100644
36717--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
36718+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
36719@@ -195,7 +195,7 @@ struct pvr2_hdw {
36720
36721 /* I2C stuff */
36722 struct i2c_adapter i2c_adap;
36723- struct i2c_algorithm i2c_algo;
36724+ i2c_algorithm_no_const i2c_algo;
36725 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
36726 int i2c_cx25840_hack_state;
36727 int i2c_linked;
36728diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
36729index 1eabff6..8e2313a 100644
36730--- a/drivers/media/video/saa7134/saa6752hs.c
36731+++ b/drivers/media/video/saa7134/saa6752hs.c
36732@@ -683,6 +683,8 @@ static int saa6752hs_init(struct v4l2_subdev *sd, u32 leading_null_bytes)
36733 unsigned char localPAT[256];
36734 unsigned char localPMT[256];
36735
36736+ pax_track_stack();
36737+
36738 /* Set video format - must be done first as it resets other settings */
36739 set_reg8(client, 0x41, h->video_format);
36740
36741diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c
36742index 9c1d3ac..b1b49e9 100644
36743--- a/drivers/media/video/saa7164/saa7164-cmd.c
36744+++ b/drivers/media/video/saa7164/saa7164-cmd.c
36745@@ -87,6 +87,8 @@ int saa7164_irq_dequeue(struct saa7164_dev *dev)
36746 wait_queue_head_t *q = 0;
36747 dprintk(DBGLVL_CMD, "%s()\n", __func__);
36748
36749+ pax_track_stack();
36750+
36751 /* While any outstand message on the bus exists... */
36752 do {
36753
36754@@ -126,6 +128,8 @@ int saa7164_cmd_dequeue(struct saa7164_dev *dev)
36755 u8 tmp[512];
36756 dprintk(DBGLVL_CMD, "%s()\n", __func__);
36757
36758+ pax_track_stack();
36759+
36760 while (loop) {
36761
36762 tmComResInfo_t tRsp = { 0, 0, 0, 0, 0, 0 };
36763diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
36764index b085496..cde0270 100644
36765--- a/drivers/media/video/usbvideo/ibmcam.c
36766+++ b/drivers/media/video/usbvideo/ibmcam.c
36767@@ -3947,15 +3947,15 @@ static struct usb_device_id id_table[] = {
36768 static int __init ibmcam_init(void)
36769 {
36770 struct usbvideo_cb cbTbl;
36771- memset(&cbTbl, 0, sizeof(cbTbl));
36772- cbTbl.probe = ibmcam_probe;
36773- cbTbl.setupOnOpen = ibmcam_setup_on_open;
36774- cbTbl.videoStart = ibmcam_video_start;
36775- cbTbl.videoStop = ibmcam_video_stop;
36776- cbTbl.processData = ibmcam_ProcessIsocData;
36777- cbTbl.postProcess = usbvideo_DeinterlaceFrame;
36778- cbTbl.adjustPicture = ibmcam_adjust_picture;
36779- cbTbl.getFPS = ibmcam_calculate_fps;
36780+ memset((void *)&cbTbl, 0, sizeof(cbTbl));
36781+ *(void **)&cbTbl.probe = ibmcam_probe;
36782+ *(void **)&cbTbl.setupOnOpen = ibmcam_setup_on_open;
36783+ *(void **)&cbTbl.videoStart = ibmcam_video_start;
36784+ *(void **)&cbTbl.videoStop = ibmcam_video_stop;
36785+ *(void **)&cbTbl.processData = ibmcam_ProcessIsocData;
36786+ *(void **)&cbTbl.postProcess = usbvideo_DeinterlaceFrame;
36787+ *(void **)&cbTbl.adjustPicture = ibmcam_adjust_picture;
36788+ *(void **)&cbTbl.getFPS = ibmcam_calculate_fps;
36789 return usbvideo_register(
36790 &cams,
36791 MAX_IBMCAM,
36792diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
36793index 31d57f2..600b735 100644
36794--- a/drivers/media/video/usbvideo/konicawc.c
36795+++ b/drivers/media/video/usbvideo/konicawc.c
36796@@ -225,7 +225,7 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev
36797 int error;
36798
36799 usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname));
36800- strncat(cam->input_physname, "/input0", sizeof(cam->input_physname));
36801+ strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname));
36802
36803 cam->input = input_dev = input_allocate_device();
36804 if (!input_dev) {
36805@@ -935,16 +935,16 @@ static int __init konicawc_init(void)
36806 struct usbvideo_cb cbTbl;
36807 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
36808 DRIVER_DESC "\n");
36809- memset(&cbTbl, 0, sizeof(cbTbl));
36810- cbTbl.probe = konicawc_probe;
36811- cbTbl.setupOnOpen = konicawc_setup_on_open;
36812- cbTbl.processData = konicawc_process_isoc;
36813- cbTbl.getFPS = konicawc_calculate_fps;
36814- cbTbl.setVideoMode = konicawc_set_video_mode;
36815- cbTbl.startDataPump = konicawc_start_data;
36816- cbTbl.stopDataPump = konicawc_stop_data;
36817- cbTbl.adjustPicture = konicawc_adjust_picture;
36818- cbTbl.userFree = konicawc_free_uvd;
36819+ memset((void * )&cbTbl, 0, sizeof(cbTbl));
36820+ *(void **)&cbTbl.probe = konicawc_probe;
36821+ *(void **)&cbTbl.setupOnOpen = konicawc_setup_on_open;
36822+ *(void **)&cbTbl.processData = konicawc_process_isoc;
36823+ *(void **)&cbTbl.getFPS = konicawc_calculate_fps;
36824+ *(void **)&cbTbl.setVideoMode = konicawc_set_video_mode;
36825+ *(void **)&cbTbl.startDataPump = konicawc_start_data;
36826+ *(void **)&cbTbl.stopDataPump = konicawc_stop_data;
36827+ *(void **)&cbTbl.adjustPicture = konicawc_adjust_picture;
36828+ *(void **)&cbTbl.userFree = konicawc_free_uvd;
36829 return usbvideo_register(
36830 &cams,
36831 MAX_CAMERAS,
36832diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
36833index 803d3e4..c4d1b96 100644
36834--- a/drivers/media/video/usbvideo/quickcam_messenger.c
36835+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
36836@@ -89,7 +89,7 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev)
36837 int error;
36838
36839 usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname));
36840- strncat(cam->input_physname, "/input0", sizeof(cam->input_physname));
36841+ strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname));
36842
36843 cam->input = input_dev = input_allocate_device();
36844 if (!input_dev) {
36845diff --git a/drivers/media/video/usbvideo/ultracam.c b/drivers/media/video/usbvideo/ultracam.c
36846index fbd1b63..292f9f0 100644
36847--- a/drivers/media/video/usbvideo/ultracam.c
36848+++ b/drivers/media/video/usbvideo/ultracam.c
36849@@ -655,14 +655,14 @@ static int __init ultracam_init(void)
36850 {
36851 struct usbvideo_cb cbTbl;
36852 memset(&cbTbl, 0, sizeof(cbTbl));
36853- cbTbl.probe = ultracam_probe;
36854- cbTbl.setupOnOpen = ultracam_setup_on_open;
36855- cbTbl.videoStart = ultracam_video_start;
36856- cbTbl.videoStop = ultracam_video_stop;
36857- cbTbl.processData = ultracam_ProcessIsocData;
36858- cbTbl.postProcess = usbvideo_DeinterlaceFrame;
36859- cbTbl.adjustPicture = ultracam_adjust_picture;
36860- cbTbl.getFPS = ultracam_calculate_fps;
36861+ *(void **)&cbTbl.probe = ultracam_probe;
36862+ *(void **)&cbTbl.setupOnOpen = ultracam_setup_on_open;
36863+ *(void **)&cbTbl.videoStart = ultracam_video_start;
36864+ *(void **)&cbTbl.videoStop = ultracam_video_stop;
36865+ *(void **)&cbTbl.processData = ultracam_ProcessIsocData;
36866+ *(void **)&cbTbl.postProcess = usbvideo_DeinterlaceFrame;
36867+ *(void **)&cbTbl.adjustPicture = ultracam_adjust_picture;
36868+ *(void **)&cbTbl.getFPS = ultracam_calculate_fps;
36869 return usbvideo_register(
36870 &cams,
36871 MAX_CAMERAS,
36872diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
36873index dea8b32..34f6878 100644
36874--- a/drivers/media/video/usbvideo/usbvideo.c
36875+++ b/drivers/media/video/usbvideo/usbvideo.c
36876@@ -697,15 +697,15 @@ int usbvideo_register(
36877 __func__, cams, base_size, num_cams);
36878
36879 /* Copy callbacks, apply defaults for those that are not set */
36880- memmove(&cams->cb, cbTbl, sizeof(cams->cb));
36881+ memmove((void *)&cams->cb, cbTbl, sizeof(cams->cb));
36882 if (cams->cb.getFrame == NULL)
36883- cams->cb.getFrame = usbvideo_GetFrame;
36884+ *(void **)&cams->cb.getFrame = usbvideo_GetFrame;
36885 if (cams->cb.disconnect == NULL)
36886- cams->cb.disconnect = usbvideo_Disconnect;
36887+ *(void **)&cams->cb.disconnect = usbvideo_Disconnect;
36888 if (cams->cb.startDataPump == NULL)
36889- cams->cb.startDataPump = usbvideo_StartDataPump;
36890+ *(void **)&cams->cb.startDataPump = usbvideo_StartDataPump;
36891 if (cams->cb.stopDataPump == NULL)
36892- cams->cb.stopDataPump = usbvideo_StopDataPump;
36893+ *(void **)&cams->cb.stopDataPump = usbvideo_StopDataPump;
36894
36895 cams->num_cameras = num_cams;
36896 cams->cam = (struct uvd *) &cams[1];
36897diff --git a/drivers/media/video/usbvideo/usbvideo.h b/drivers/media/video/usbvideo/usbvideo.h
36898index c66985b..7fa143a 100644
36899--- a/drivers/media/video/usbvideo/usbvideo.h
36900+++ b/drivers/media/video/usbvideo/usbvideo.h
36901@@ -268,7 +268,7 @@ struct usbvideo_cb {
36902 int (*startDataPump)(struct uvd *uvd);
36903 void (*stopDataPump)(struct uvd *uvd);
36904 int (*setVideoMode)(struct uvd *uvd, struct video_window *vw);
36905-};
36906+} __no_const;
36907
36908 struct usbvideo {
36909 int num_cameras; /* As allocated */
36910diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
36911index e0f91e4..37554ea 100644
36912--- a/drivers/media/video/usbvision/usbvision-core.c
36913+++ b/drivers/media/video/usbvision/usbvision-core.c
36914@@ -820,6 +820,8 @@ static enum ParseState usbvision_parse_compress(struct usb_usbvision *usbvision,
36915 unsigned char rv, gv, bv;
36916 static unsigned char *Y, *U, *V;
36917
36918+ pax_track_stack();
36919+
36920 frame = usbvision->curFrame;
36921 imageSize = frame->frmwidth * frame->frmheight;
36922 if ( (frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
36923diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
36924index 0d06e7c..3d17d24 100644
36925--- a/drivers/media/video/v4l2-device.c
36926+++ b/drivers/media/video/v4l2-device.c
36927@@ -50,9 +50,9 @@ int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev)
36928 EXPORT_SYMBOL_GPL(v4l2_device_register);
36929
36930 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
36931- atomic_t *instance)
36932+ atomic_unchecked_t *instance)
36933 {
36934- int num = atomic_inc_return(instance) - 1;
36935+ int num = atomic_inc_return_unchecked(instance) - 1;
36936 int len = strlen(basename);
36937
36938 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
36939diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
36940index 032ebae..6a3532c 100644
36941--- a/drivers/media/video/videobuf-dma-sg.c
36942+++ b/drivers/media/video/videobuf-dma-sg.c
36943@@ -693,6 +693,8 @@ void *videobuf_sg_alloc(size_t size)
36944 {
36945 struct videobuf_queue q;
36946
36947+ pax_track_stack();
36948+
36949 /* Required to make generic handler to call __videobuf_alloc */
36950 q.int_ops = &sg_ops;
36951
36952diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
36953index b6992b7..9fa7547 100644
36954--- a/drivers/message/fusion/mptbase.c
36955+++ b/drivers/message/fusion/mptbase.c
36956@@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **start, off_t offset, int request, int *eo
36957 len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
36958 len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
36959
36960+#ifdef CONFIG_GRKERNSEC_HIDESYM
36961+ len += sprintf(buf+len, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
36962+ NULL, NULL);
36963+#else
36964 len += sprintf(buf+len, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
36965 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
36966+#endif
36967+
36968 /*
36969 * Rounding UP to nearest 4-kB boundary here...
36970 */
36971diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
36972index 83873e3..e360e9a 100644
36973--- a/drivers/message/fusion/mptsas.c
36974+++ b/drivers/message/fusion/mptsas.c
36975@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
36976 return 0;
36977 }
36978
36979+static inline void
36980+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
36981+{
36982+ if (phy_info->port_details) {
36983+ phy_info->port_details->rphy = rphy;
36984+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
36985+ ioc->name, rphy));
36986+ }
36987+
36988+ if (rphy) {
36989+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
36990+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
36991+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
36992+ ioc->name, rphy, rphy->dev.release));
36993+ }
36994+}
36995+
36996 /* no mutex */
36997 static void
36998 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
36999@@ -474,23 +491,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
37000 return NULL;
37001 }
37002
37003-static inline void
37004-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
37005-{
37006- if (phy_info->port_details) {
37007- phy_info->port_details->rphy = rphy;
37008- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
37009- ioc->name, rphy));
37010- }
37011-
37012- if (rphy) {
37013- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
37014- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
37015- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
37016- ioc->name, rphy, rphy->dev.release));
37017- }
37018-}
37019-
37020 static inline struct sas_port *
37021 mptsas_get_port(struct mptsas_phyinfo *phy_info)
37022 {
37023diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
37024index bd096ca..332cf76 100644
37025--- a/drivers/message/fusion/mptscsih.c
37026+++ b/drivers/message/fusion/mptscsih.c
37027@@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost)
37028
37029 h = shost_priv(SChost);
37030
37031- if (h) {
37032- if (h->info_kbuf == NULL)
37033- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
37034- return h->info_kbuf;
37035- h->info_kbuf[0] = '\0';
37036+ if (!h)
37037+ return NULL;
37038
37039- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
37040- h->info_kbuf[size-1] = '\0';
37041- }
37042+ if (h->info_kbuf == NULL)
37043+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
37044+ return h->info_kbuf;
37045+ h->info_kbuf[0] = '\0';
37046+
37047+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
37048+ h->info_kbuf[size-1] = '\0';
37049
37050 return h->info_kbuf;
37051 }
37052diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
37053index efba702..59b2c0f 100644
37054--- a/drivers/message/i2o/i2o_config.c
37055+++ b/drivers/message/i2o/i2o_config.c
37056@@ -787,6 +787,8 @@ static int i2o_cfg_passthru(unsigned long arg)
37057 struct i2o_message *msg;
37058 unsigned int iop;
37059
37060+ pax_track_stack();
37061+
37062 if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
37063 return -EFAULT;
37064
37065diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
37066index 7045c45..c07b170 100644
37067--- a/drivers/message/i2o/i2o_proc.c
37068+++ b/drivers/message/i2o/i2o_proc.c
37069@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
37070 "Array Controller Device"
37071 };
37072
37073-static char *chtostr(u8 * chars, int n)
37074-{
37075- char tmp[256];
37076- tmp[0] = 0;
37077- return strncat(tmp, (char *)chars, n);
37078-}
37079-
37080 static int i2o_report_query_status(struct seq_file *seq, int block_status,
37081 char *group)
37082 {
37083@@ -842,8 +835,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
37084
37085 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
37086 seq_printf(seq, "%-#8x", ddm_table.module_id);
37087- seq_printf(seq, "%-29s",
37088- chtostr(ddm_table.module_name_version, 28));
37089+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
37090 seq_printf(seq, "%9d ", ddm_table.data_size);
37091 seq_printf(seq, "%8d", ddm_table.code_size);
37092
37093@@ -944,8 +936,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
37094
37095 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
37096 seq_printf(seq, "%-#8x", dst->module_id);
37097- seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
37098- seq_printf(seq, "%-9s", chtostr(dst->date, 8));
37099+ seq_printf(seq, "%-.28s", dst->module_name_version);
37100+ seq_printf(seq, "%-.8s", dst->date);
37101 seq_printf(seq, "%8d ", dst->module_size);
37102 seq_printf(seq, "%8d ", dst->mpb_size);
37103 seq_printf(seq, "0x%04x", dst->module_flags);
37104@@ -1276,14 +1268,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
37105 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
37106 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
37107 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
37108- seq_printf(seq, "Vendor info : %s\n",
37109- chtostr((u8 *) (work32 + 2), 16));
37110- seq_printf(seq, "Product info : %s\n",
37111- chtostr((u8 *) (work32 + 6), 16));
37112- seq_printf(seq, "Description : %s\n",
37113- chtostr((u8 *) (work32 + 10), 16));
37114- seq_printf(seq, "Product rev. : %s\n",
37115- chtostr((u8 *) (work32 + 14), 8));
37116+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
37117+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
37118+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
37119+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
37120
37121 seq_printf(seq, "Serial number : ");
37122 print_serial_number(seq, (u8 *) (work32 + 16),
37123@@ -1328,10 +1316,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
37124 }
37125
37126 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
37127- seq_printf(seq, "Module name : %s\n",
37128- chtostr(result.module_name, 24));
37129- seq_printf(seq, "Module revision : %s\n",
37130- chtostr(result.module_rev, 8));
37131+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
37132+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
37133
37134 seq_printf(seq, "Serial number : ");
37135 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
37136@@ -1362,14 +1348,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
37137 return 0;
37138 }
37139
37140- seq_printf(seq, "Device name : %s\n",
37141- chtostr(result.device_name, 64));
37142- seq_printf(seq, "Service name : %s\n",
37143- chtostr(result.service_name, 64));
37144- seq_printf(seq, "Physical name : %s\n",
37145- chtostr(result.physical_location, 64));
37146- seq_printf(seq, "Instance number : %s\n",
37147- chtostr(result.instance_number, 4));
37148+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
37149+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
37150+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
37151+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
37152
37153 return 0;
37154 }
37155diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
37156index 27cf4af..b1205b8 100644
37157--- a/drivers/message/i2o/iop.c
37158+++ b/drivers/message/i2o/iop.c
37159@@ -110,10 +110,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
37160
37161 spin_lock_irqsave(&c->context_list_lock, flags);
37162
37163- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
37164- atomic_inc(&c->context_list_counter);
37165+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
37166+ atomic_inc_unchecked(&c->context_list_counter);
37167
37168- entry->context = atomic_read(&c->context_list_counter);
37169+ entry->context = atomic_read_unchecked(&c->context_list_counter);
37170
37171 list_add(&entry->list, &c->context_list);
37172
37173@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
37174
37175 #if BITS_PER_LONG == 64
37176 spin_lock_init(&c->context_list_lock);
37177- atomic_set(&c->context_list_counter, 0);
37178+ atomic_set_unchecked(&c->context_list_counter, 0);
37179 INIT_LIST_HEAD(&c->context_list);
37180 #endif
37181
37182diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
37183index 78e3e85..66c9a0d 100644
37184--- a/drivers/mfd/ab3100-core.c
37185+++ b/drivers/mfd/ab3100-core.c
37186@@ -777,7 +777,7 @@ struct ab_family_id {
37187 char *name;
37188 };
37189
37190-static const struct ab_family_id ids[] __initdata = {
37191+static const struct ab_family_id ids[] __initconst = {
37192 /* AB3100 */
37193 {
37194 .id = 0xc0,
37195diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c
37196index 8d8c932..8104515 100644
37197--- a/drivers/mfd/wm8350-i2c.c
37198+++ b/drivers/mfd/wm8350-i2c.c
37199@@ -43,6 +43,8 @@ static int wm8350_i2c_write_device(struct wm8350 *wm8350, char reg,
37200 u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
37201 int ret;
37202
37203+ pax_track_stack();
37204+
37205 if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
37206 return -EINVAL;
37207
37208diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
37209index e4ff50b..4cc3f04 100644
37210--- a/drivers/misc/kgdbts.c
37211+++ b/drivers/misc/kgdbts.c
37212@@ -118,7 +118,7 @@
37213 } while (0)
37214 #define MAX_CONFIG_LEN 40
37215
37216-static struct kgdb_io kgdbts_io_ops;
37217+static const struct kgdb_io kgdbts_io_ops;
37218 static char get_buf[BUFMAX];
37219 static int get_buf_cnt;
37220 static char put_buf[BUFMAX];
37221@@ -1102,7 +1102,7 @@ static void kgdbts_post_exp_handler(void)
37222 module_put(THIS_MODULE);
37223 }
37224
37225-static struct kgdb_io kgdbts_io_ops = {
37226+static const struct kgdb_io kgdbts_io_ops = {
37227 .name = "kgdbts",
37228 .read_char = kgdbts_get_char,
37229 .write_char = kgdbts_put_char,
37230diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
37231index 37e7cfc..67cfb76 100644
37232--- a/drivers/misc/sgi-gru/gruhandles.c
37233+++ b/drivers/misc/sgi-gru/gruhandles.c
37234@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistics[mcsop_last];
37235
37236 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
37237 {
37238- atomic_long_inc(&mcs_op_statistics[op].count);
37239- atomic_long_add(clks, &mcs_op_statistics[op].total);
37240+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
37241+ atomic_long_add_unchecked(clks, &mcs_op_statistics[op].total);
37242 if (mcs_op_statistics[op].max < clks)
37243 mcs_op_statistics[op].max = clks;
37244 }
37245diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
37246index 3f2375c..467c6e6 100644
37247--- a/drivers/misc/sgi-gru/gruprocfs.c
37248+++ b/drivers/misc/sgi-gru/gruprocfs.c
37249@@ -32,9 +32,9 @@
37250
37251 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
37252
37253-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
37254+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
37255 {
37256- unsigned long val = atomic_long_read(v);
37257+ unsigned long val = atomic_long_read_unchecked(v);
37258
37259 if (val)
37260 seq_printf(s, "%16lu %s\n", val, id);
37261@@ -136,8 +136,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
37262 "cch_interrupt_sync", "cch_deallocate", "tgh_invalidate"};
37263
37264 for (op = 0; op < mcsop_last; op++) {
37265- count = atomic_long_read(&mcs_op_statistics[op].count);
37266- total = atomic_long_read(&mcs_op_statistics[op].total);
37267+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
37268+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
37269 max = mcs_op_statistics[op].max;
37270 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
37271 count ? total / count : 0, max);
37272diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
37273index 46990bc..4a251b5 100644
37274--- a/drivers/misc/sgi-gru/grutables.h
37275+++ b/drivers/misc/sgi-gru/grutables.h
37276@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
37277 * GRU statistics.
37278 */
37279 struct gru_stats_s {
37280- atomic_long_t vdata_alloc;
37281- atomic_long_t vdata_free;
37282- atomic_long_t gts_alloc;
37283- atomic_long_t gts_free;
37284- atomic_long_t vdata_double_alloc;
37285- atomic_long_t gts_double_allocate;
37286- atomic_long_t assign_context;
37287- atomic_long_t assign_context_failed;
37288- atomic_long_t free_context;
37289- atomic_long_t load_user_context;
37290- atomic_long_t load_kernel_context;
37291- atomic_long_t lock_kernel_context;
37292- atomic_long_t unlock_kernel_context;
37293- atomic_long_t steal_user_context;
37294- atomic_long_t steal_kernel_context;
37295- atomic_long_t steal_context_failed;
37296- atomic_long_t nopfn;
37297- atomic_long_t break_cow;
37298- atomic_long_t asid_new;
37299- atomic_long_t asid_next;
37300- atomic_long_t asid_wrap;
37301- atomic_long_t asid_reuse;
37302- atomic_long_t intr;
37303- atomic_long_t intr_mm_lock_failed;
37304- atomic_long_t call_os;
37305- atomic_long_t call_os_offnode_reference;
37306- atomic_long_t call_os_check_for_bug;
37307- atomic_long_t call_os_wait_queue;
37308- atomic_long_t user_flush_tlb;
37309- atomic_long_t user_unload_context;
37310- atomic_long_t user_exception;
37311- atomic_long_t set_context_option;
37312- atomic_long_t migrate_check;
37313- atomic_long_t migrated_retarget;
37314- atomic_long_t migrated_unload;
37315- atomic_long_t migrated_unload_delay;
37316- atomic_long_t migrated_nopfn_retarget;
37317- atomic_long_t migrated_nopfn_unload;
37318- atomic_long_t tlb_dropin;
37319- atomic_long_t tlb_dropin_fail_no_asid;
37320- atomic_long_t tlb_dropin_fail_upm;
37321- atomic_long_t tlb_dropin_fail_invalid;
37322- atomic_long_t tlb_dropin_fail_range_active;
37323- atomic_long_t tlb_dropin_fail_idle;
37324- atomic_long_t tlb_dropin_fail_fmm;
37325- atomic_long_t tlb_dropin_fail_no_exception;
37326- atomic_long_t tlb_dropin_fail_no_exception_war;
37327- atomic_long_t tfh_stale_on_fault;
37328- atomic_long_t mmu_invalidate_range;
37329- atomic_long_t mmu_invalidate_page;
37330- atomic_long_t mmu_clear_flush_young;
37331- atomic_long_t flush_tlb;
37332- atomic_long_t flush_tlb_gru;
37333- atomic_long_t flush_tlb_gru_tgh;
37334- atomic_long_t flush_tlb_gru_zero_asid;
37335+ atomic_long_unchecked_t vdata_alloc;
37336+ atomic_long_unchecked_t vdata_free;
37337+ atomic_long_unchecked_t gts_alloc;
37338+ atomic_long_unchecked_t gts_free;
37339+ atomic_long_unchecked_t vdata_double_alloc;
37340+ atomic_long_unchecked_t gts_double_allocate;
37341+ atomic_long_unchecked_t assign_context;
37342+ atomic_long_unchecked_t assign_context_failed;
37343+ atomic_long_unchecked_t free_context;
37344+ atomic_long_unchecked_t load_user_context;
37345+ atomic_long_unchecked_t load_kernel_context;
37346+ atomic_long_unchecked_t lock_kernel_context;
37347+ atomic_long_unchecked_t unlock_kernel_context;
37348+ atomic_long_unchecked_t steal_user_context;
37349+ atomic_long_unchecked_t steal_kernel_context;
37350+ atomic_long_unchecked_t steal_context_failed;
37351+ atomic_long_unchecked_t nopfn;
37352+ atomic_long_unchecked_t break_cow;
37353+ atomic_long_unchecked_t asid_new;
37354+ atomic_long_unchecked_t asid_next;
37355+ atomic_long_unchecked_t asid_wrap;
37356+ atomic_long_unchecked_t asid_reuse;
37357+ atomic_long_unchecked_t intr;
37358+ atomic_long_unchecked_t intr_mm_lock_failed;
37359+ atomic_long_unchecked_t call_os;
37360+ atomic_long_unchecked_t call_os_offnode_reference;
37361+ atomic_long_unchecked_t call_os_check_for_bug;
37362+ atomic_long_unchecked_t call_os_wait_queue;
37363+ atomic_long_unchecked_t user_flush_tlb;
37364+ atomic_long_unchecked_t user_unload_context;
37365+ atomic_long_unchecked_t user_exception;
37366+ atomic_long_unchecked_t set_context_option;
37367+ atomic_long_unchecked_t migrate_check;
37368+ atomic_long_unchecked_t migrated_retarget;
37369+ atomic_long_unchecked_t migrated_unload;
37370+ atomic_long_unchecked_t migrated_unload_delay;
37371+ atomic_long_unchecked_t migrated_nopfn_retarget;
37372+ atomic_long_unchecked_t migrated_nopfn_unload;
37373+ atomic_long_unchecked_t tlb_dropin;
37374+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
37375+ atomic_long_unchecked_t tlb_dropin_fail_upm;
37376+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
37377+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
37378+ atomic_long_unchecked_t tlb_dropin_fail_idle;
37379+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
37380+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
37381+ atomic_long_unchecked_t tlb_dropin_fail_no_exception_war;
37382+ atomic_long_unchecked_t tfh_stale_on_fault;
37383+ atomic_long_unchecked_t mmu_invalidate_range;
37384+ atomic_long_unchecked_t mmu_invalidate_page;
37385+ atomic_long_unchecked_t mmu_clear_flush_young;
37386+ atomic_long_unchecked_t flush_tlb;
37387+ atomic_long_unchecked_t flush_tlb_gru;
37388+ atomic_long_unchecked_t flush_tlb_gru_tgh;
37389+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
37390
37391- atomic_long_t copy_gpa;
37392+ atomic_long_unchecked_t copy_gpa;
37393
37394- atomic_long_t mesq_receive;
37395- atomic_long_t mesq_receive_none;
37396- atomic_long_t mesq_send;
37397- atomic_long_t mesq_send_failed;
37398- atomic_long_t mesq_noop;
37399- atomic_long_t mesq_send_unexpected_error;
37400- atomic_long_t mesq_send_lb_overflow;
37401- atomic_long_t mesq_send_qlimit_reached;
37402- atomic_long_t mesq_send_amo_nacked;
37403- atomic_long_t mesq_send_put_nacked;
37404- atomic_long_t mesq_qf_not_full;
37405- atomic_long_t mesq_qf_locked;
37406- atomic_long_t mesq_qf_noop_not_full;
37407- atomic_long_t mesq_qf_switch_head_failed;
37408- atomic_long_t mesq_qf_unexpected_error;
37409- atomic_long_t mesq_noop_unexpected_error;
37410- atomic_long_t mesq_noop_lb_overflow;
37411- atomic_long_t mesq_noop_qlimit_reached;
37412- atomic_long_t mesq_noop_amo_nacked;
37413- atomic_long_t mesq_noop_put_nacked;
37414+ atomic_long_unchecked_t mesq_receive;
37415+ atomic_long_unchecked_t mesq_receive_none;
37416+ atomic_long_unchecked_t mesq_send;
37417+ atomic_long_unchecked_t mesq_send_failed;
37418+ atomic_long_unchecked_t mesq_noop;
37419+ atomic_long_unchecked_t mesq_send_unexpected_error;
37420+ atomic_long_unchecked_t mesq_send_lb_overflow;
37421+ atomic_long_unchecked_t mesq_send_qlimit_reached;
37422+ atomic_long_unchecked_t mesq_send_amo_nacked;
37423+ atomic_long_unchecked_t mesq_send_put_nacked;
37424+ atomic_long_unchecked_t mesq_qf_not_full;
37425+ atomic_long_unchecked_t mesq_qf_locked;
37426+ atomic_long_unchecked_t mesq_qf_noop_not_full;
37427+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
37428+ atomic_long_unchecked_t mesq_qf_unexpected_error;
37429+ atomic_long_unchecked_t mesq_noop_unexpected_error;
37430+ atomic_long_unchecked_t mesq_noop_lb_overflow;
37431+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
37432+ atomic_long_unchecked_t mesq_noop_amo_nacked;
37433+ atomic_long_unchecked_t mesq_noop_put_nacked;
37434
37435 };
37436
37437@@ -252,8 +252,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
37438 cchop_deallocate, tghop_invalidate, mcsop_last};
37439
37440 struct mcs_op_statistic {
37441- atomic_long_t count;
37442- atomic_long_t total;
37443+ atomic_long_unchecked_t count;
37444+ atomic_long_unchecked_t total;
37445 unsigned long max;
37446 };
37447
37448@@ -276,7 +276,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
37449
37450 #define STAT(id) do { \
37451 if (gru_options & OPT_STATS) \
37452- atomic_long_inc(&gru_stats.id); \
37453+ atomic_long_inc_unchecked(&gru_stats.id); \
37454 } while (0)
37455
37456 #ifdef CONFIG_SGI_GRU_DEBUG
37457diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
37458index 2275126..12a9dbfb 100644
37459--- a/drivers/misc/sgi-xp/xp.h
37460+++ b/drivers/misc/sgi-xp/xp.h
37461@@ -289,7 +289,7 @@ struct xpc_interface {
37462 xpc_notify_func, void *);
37463 void (*received) (short, int, void *);
37464 enum xp_retval (*partid_to_nasids) (short, void *);
37465-};
37466+} __no_const;
37467
37468 extern struct xpc_interface xpc_interface;
37469
37470diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
37471index b94d5f7..7f494c5 100644
37472--- a/drivers/misc/sgi-xp/xpc.h
37473+++ b/drivers/misc/sgi-xp/xpc.h
37474@@ -835,6 +835,7 @@ struct xpc_arch_operations {
37475 void (*received_payload) (struct xpc_channel *, void *);
37476 void (*notify_senders_of_disconnect) (struct xpc_channel *);
37477 };
37478+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
37479
37480 /* struct xpc_partition act_state values (for XPC HB) */
37481
37482@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
37483 /* found in xpc_main.c */
37484 extern struct device *xpc_part;
37485 extern struct device *xpc_chan;
37486-extern struct xpc_arch_operations xpc_arch_ops;
37487+extern xpc_arch_operations_no_const xpc_arch_ops;
37488 extern int xpc_disengage_timelimit;
37489 extern int xpc_disengage_timedout;
37490 extern int xpc_activate_IRQ_rcvd;
37491diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
37492index fd3688a..7e211a4 100644
37493--- a/drivers/misc/sgi-xp/xpc_main.c
37494+++ b/drivers/misc/sgi-xp/xpc_main.c
37495@@ -169,7 +169,7 @@ static struct notifier_block xpc_die_notifier = {
37496 .notifier_call = xpc_system_die,
37497 };
37498
37499-struct xpc_arch_operations xpc_arch_ops;
37500+xpc_arch_operations_no_const xpc_arch_ops;
37501
37502 /*
37503 * Timer function to enforce the timelimit on the partition disengage.
37504diff --git a/drivers/misc/sgi-xp/xpc_sn2.c b/drivers/misc/sgi-xp/xpc_sn2.c
37505index 8b70e03..700bda6 100644
37506--- a/drivers/misc/sgi-xp/xpc_sn2.c
37507+++ b/drivers/misc/sgi-xp/xpc_sn2.c
37508@@ -2350,7 +2350,7 @@ xpc_received_payload_sn2(struct xpc_channel *ch, void *payload)
37509 xpc_acknowledge_msgs_sn2(ch, get, msg->flags);
37510 }
37511
37512-static struct xpc_arch_operations xpc_arch_ops_sn2 = {
37513+static const struct xpc_arch_operations xpc_arch_ops_sn2 = {
37514 .setup_partitions = xpc_setup_partitions_sn2,
37515 .teardown_partitions = xpc_teardown_partitions_sn2,
37516 .process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_sn2,
37517@@ -2413,7 +2413,9 @@ xpc_init_sn2(void)
37518 int ret;
37519 size_t buf_size;
37520
37521- xpc_arch_ops = xpc_arch_ops_sn2;
37522+ pax_open_kernel();
37523+ memcpy((void *)&xpc_arch_ops, &xpc_arch_ops_sn2, sizeof(xpc_arch_ops_sn2));
37524+ pax_close_kernel();
37525
37526 if (offsetof(struct xpc_msg_sn2, payload) > XPC_MSG_HDR_MAX_SIZE) {
37527 dev_err(xpc_part, "header portion of struct xpc_msg_sn2 is "
37528diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
37529index 8e08d71..7cb8c9b 100644
37530--- a/drivers/misc/sgi-xp/xpc_uv.c
37531+++ b/drivers/misc/sgi-xp/xpc_uv.c
37532@@ -1669,7 +1669,7 @@ xpc_received_payload_uv(struct xpc_channel *ch, void *payload)
37533 XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret);
37534 }
37535
37536-static struct xpc_arch_operations xpc_arch_ops_uv = {
37537+static const struct xpc_arch_operations xpc_arch_ops_uv = {
37538 .setup_partitions = xpc_setup_partitions_uv,
37539 .teardown_partitions = xpc_teardown_partitions_uv,
37540 .process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_uv,
37541@@ -1729,7 +1729,9 @@ static struct xpc_arch_operations xpc_arch_ops_uv = {
37542 int
37543 xpc_init_uv(void)
37544 {
37545- xpc_arch_ops = xpc_arch_ops_uv;
37546+ pax_open_kernel();
37547+ memcpy((void *)&xpc_arch_ops, &xpc_arch_ops_uv, sizeof(xpc_arch_ops_uv));
37548+ pax_close_kernel();
37549
37550 if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
37551 dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n",
37552diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
37553index 6fd20b42..650efe3 100644
37554--- a/drivers/mmc/host/sdhci-pci.c
37555+++ b/drivers/mmc/host/sdhci-pci.c
37556@@ -297,7 +297,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
37557 .probe = via_probe,
37558 };
37559
37560-static const struct pci_device_id pci_ids[] __devinitdata = {
37561+static const struct pci_device_id pci_ids[] __devinitconst = {
37562 {
37563 .vendor = PCI_VENDOR_ID_RICOH,
37564 .device = PCI_DEVICE_ID_RICOH_R5C822,
37565diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
37566index e7563a9..5f90ce5 100644
37567--- a/drivers/mtd/chips/cfi_cmdset_0001.c
37568+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
37569@@ -743,6 +743,8 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long
37570 struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
37571 unsigned long timeo = jiffies + HZ;
37572
37573+ pax_track_stack();
37574+
37575 /* Prevent setting state FL_SYNCING for chip in suspended state. */
37576 if (mode == FL_SYNCING && chip->oldstate != FL_READY)
37577 goto sleep;
37578@@ -1642,6 +1644,8 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
37579 unsigned long initial_adr;
37580 int initial_len = len;
37581
37582+ pax_track_stack();
37583+
37584 wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;
37585 adr += chip->start;
37586 initial_adr = adr;
37587@@ -1860,6 +1864,8 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
37588 int retries = 3;
37589 int ret;
37590
37591+ pax_track_stack();
37592+
37593 adr += chip->start;
37594
37595 retry:
37596diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
37597index 0667a67..3ab97ed 100644
37598--- a/drivers/mtd/chips/cfi_cmdset_0020.c
37599+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
37600@@ -255,6 +255,8 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
37601 unsigned long cmd_addr;
37602 struct cfi_private *cfi = map->fldrv_priv;
37603
37604+ pax_track_stack();
37605+
37606 adr += chip->start;
37607
37608 /* Ensure cmd read/writes are aligned. */
37609@@ -428,6 +430,8 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
37610 DECLARE_WAITQUEUE(wait, current);
37611 int wbufsize, z;
37612
37613+ pax_track_stack();
37614+
37615 /* M58LW064A requires bus alignment for buffer wriets -- saw */
37616 if (adr & (map_bankwidth(map)-1))
37617 return -EINVAL;
37618@@ -742,6 +746,8 @@ static inline int do_erase_oneblock(struct map_info *map, struct flchip *chip, u
37619 DECLARE_WAITQUEUE(wait, current);
37620 int ret = 0;
37621
37622+ pax_track_stack();
37623+
37624 adr += chip->start;
37625
37626 /* Let's determine this according to the interleave only once */
37627@@ -1047,6 +1053,8 @@ static inline int do_lock_oneblock(struct map_info *map, struct flchip *chip, un
37628 unsigned long timeo = jiffies + HZ;
37629 DECLARE_WAITQUEUE(wait, current);
37630
37631+ pax_track_stack();
37632+
37633 adr += chip->start;
37634
37635 /* Let's determine this according to the interleave only once */
37636@@ -1196,6 +1204,8 @@ static inline int do_unlock_oneblock(struct map_info *map, struct flchip *chip,
37637 unsigned long timeo = jiffies + HZ;
37638 DECLARE_WAITQUEUE(wait, current);
37639
37640+ pax_track_stack();
37641+
37642 adr += chip->start;
37643
37644 /* Let's determine this according to the interleave only once */
37645diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
37646index 5bf5f46..c5de373 100644
37647--- a/drivers/mtd/devices/doc2000.c
37648+++ b/drivers/mtd/devices/doc2000.c
37649@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
37650
37651 /* The ECC will not be calculated correctly if less than 512 is written */
37652 /* DBB-
37653- if (len != 0x200 && eccbuf)
37654+ if (len != 0x200)
37655 printk(KERN_WARNING
37656 "ECC needs a full sector write (adr: %lx size %lx)\n",
37657 (long) to, (long) len);
37658diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
37659index 0990f78..bb4e8a4 100644
37660--- a/drivers/mtd/devices/doc2001.c
37661+++ b/drivers/mtd/devices/doc2001.c
37662@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
37663 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
37664
37665 /* Don't allow read past end of device */
37666- if (from >= this->totlen)
37667+ if (from >= this->totlen || !len)
37668 return -EINVAL;
37669
37670 /* Don't allow a single read to cross a 512-byte block boundary */
37671diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
37672index e56d6b4..f07e6cf 100644
37673--- a/drivers/mtd/ftl.c
37674+++ b/drivers/mtd/ftl.c
37675@@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit,
37676 loff_t offset;
37677 uint16_t srcunitswap = cpu_to_le16(srcunit);
37678
37679+ pax_track_stack();
37680+
37681 eun = &part->EUNInfo[srcunit];
37682 xfer = &part->XferInfo[xferunit];
37683 DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
37684diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
37685index 8aca552..146446e 100755
37686--- a/drivers/mtd/inftlcore.c
37687+++ b/drivers/mtd/inftlcore.c
37688@@ -260,6 +260,8 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
37689 struct inftl_oob oob;
37690 size_t retlen;
37691
37692+ pax_track_stack();
37693+
37694 DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
37695 "pending=%d)\n", inftl, thisVUC, pendingblock);
37696
37697diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
37698index 32e82ae..ed50953 100644
37699--- a/drivers/mtd/inftlmount.c
37700+++ b/drivers/mtd/inftlmount.c
37701@@ -54,6 +54,8 @@ static int find_boot_record(struct INFTLrecord *inftl)
37702 struct INFTLPartition *ip;
37703 size_t retlen;
37704
37705+ pax_track_stack();
37706+
37707 DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
37708
37709 /*
37710diff --git a/drivers/mtd/lpddr/qinfo_probe.c b/drivers/mtd/lpddr/qinfo_probe.c
37711index 79bf40f..fe5f8fd 100644
37712--- a/drivers/mtd/lpddr/qinfo_probe.c
37713+++ b/drivers/mtd/lpddr/qinfo_probe.c
37714@@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map_info *map, struct lpddr_private *lpddr)
37715 {
37716 map_word pfow_val[4];
37717
37718+ pax_track_stack();
37719+
37720 /* Check identification string */
37721 pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P);
37722 pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
37723diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
37724index 726a1b8..f46b460 100644
37725--- a/drivers/mtd/mtdchar.c
37726+++ b/drivers/mtd/mtdchar.c
37727@@ -461,6 +461,8 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
37728 u_long size;
37729 struct mtd_info_user info;
37730
37731+ pax_track_stack();
37732+
37733 DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
37734
37735 size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
37736diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
37737index 1002e18..26d82d5 100644
37738--- a/drivers/mtd/nftlcore.c
37739+++ b/drivers/mtd/nftlcore.c
37740@@ -254,6 +254,8 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
37741 int inplace = 1;
37742 size_t retlen;
37743
37744+ pax_track_stack();
37745+
37746 memset(BlockMap, 0xff, sizeof(BlockMap));
37747 memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
37748
37749diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
37750index 8b22b18..6fada85 100644
37751--- a/drivers/mtd/nftlmount.c
37752+++ b/drivers/mtd/nftlmount.c
37753@@ -23,6 +23,7 @@
37754 #include <asm/errno.h>
37755 #include <linux/delay.h>
37756 #include <linux/slab.h>
37757+#include <linux/sched.h>
37758 #include <linux/mtd/mtd.h>
37759 #include <linux/mtd/nand.h>
37760 #include <linux/mtd/nftl.h>
37761@@ -44,6 +45,8 @@ static int find_boot_record(struct NFTLrecord *nftl)
37762 struct mtd_info *mtd = nftl->mbd.mtd;
37763 unsigned int i;
37764
37765+ pax_track_stack();
37766+
37767 /* Assume logical EraseSize == physical erasesize for starting the scan.
37768 We'll sort it out later if we find a MediaHeader which says otherwise */
37769 /* Actually, we won't. The new DiskOnChip driver has already scanned
37770diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
37771index 14cec04..d775b87 100644
37772--- a/drivers/mtd/ubi/build.c
37773+++ b/drivers/mtd/ubi/build.c
37774@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
37775 static int __init bytes_str_to_int(const char *str)
37776 {
37777 char *endp;
37778- unsigned long result;
37779+ unsigned long result, scale = 1;
37780
37781 result = simple_strtoul(str, &endp, 0);
37782 if (str == endp || result >= INT_MAX) {
37783@@ -1266,11 +1266,11 @@ static int __init bytes_str_to_int(const char *str)
37784
37785 switch (*endp) {
37786 case 'G':
37787- result *= 1024;
37788+ scale *= 1024;
37789 case 'M':
37790- result *= 1024;
37791+ scale *= 1024;
37792 case 'K':
37793- result *= 1024;
37794+ scale *= 1024;
37795 if (endp[1] == 'i' && endp[2] == 'B')
37796 endp += 2;
37797 case '\0':
37798@@ -1281,7 +1281,13 @@ static int __init bytes_str_to_int(const char *str)
37799 return -EINVAL;
37800 }
37801
37802- return result;
37803+ if ((intoverflow_t)result*scale >= INT_MAX) {
37804+ printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n",
37805+ str);
37806+ return -EINVAL;
37807+ }
37808+
37809+ return result*scale;
37810 }
37811
37812 /**
37813diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
37814index ab68886..ca405e8 100644
37815--- a/drivers/net/atlx/atl2.c
37816+++ b/drivers/net/atlx/atl2.c
37817@@ -2845,7 +2845,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
37818 */
37819
37820 #define ATL2_PARAM(X, desc) \
37821- static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
37822+ static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
37823 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
37824 MODULE_PARM_DESC(X, desc);
37825 #else
37826diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
37827index 4874b2b..67f8526 100644
37828--- a/drivers/net/bnx2.c
37829+++ b/drivers/net/bnx2.c
37830@@ -5809,6 +5809,8 @@ bnx2_test_nvram(struct bnx2 *bp)
37831 int rc = 0;
37832 u32 magic, csum;
37833
37834+ pax_track_stack();
37835+
37836 if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
37837 goto test_nvram_done;
37838
37839diff --git a/drivers/net/cxgb3/l2t.h b/drivers/net/cxgb3/l2t.h
37840index fd3eb07..8a6978d 100644
37841--- a/drivers/net/cxgb3/l2t.h
37842+++ b/drivers/net/cxgb3/l2t.h
37843@@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
37844 */
37845 struct l2t_skb_cb {
37846 arp_failure_handler_func arp_failure_handler;
37847-};
37848+} __no_const;
37849
37850 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
37851
37852diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
37853index 032cfe0..411af379 100644
37854--- a/drivers/net/cxgb3/t3_hw.c
37855+++ b/drivers/net/cxgb3/t3_hw.c
37856@@ -699,6 +699,8 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
37857 int i, addr, ret;
37858 struct t3_vpd vpd;
37859
37860+ pax_track_stack();
37861+
37862 /*
37863 * Card information is normally at VPD_BASE but some early cards had
37864 * it at 0.
37865diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
37866index d1e0563..b9e129c 100644
37867--- a/drivers/net/e1000e/82571.c
37868+++ b/drivers/net/e1000e/82571.c
37869@@ -212,7 +212,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
37870 {
37871 struct e1000_hw *hw = &adapter->hw;
37872 struct e1000_mac_info *mac = &hw->mac;
37873- struct e1000_mac_operations *func = &mac->ops;
37874+ e1000_mac_operations_no_const *func = &mac->ops;
37875 u32 swsm = 0;
37876 u32 swsm2 = 0;
37877 bool force_clear_smbi = false;
37878@@ -1656,7 +1656,7 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw)
37879 temp = er32(ICRXDMTC);
37880 }
37881
37882-static struct e1000_mac_operations e82571_mac_ops = {
37883+static const struct e1000_mac_operations e82571_mac_ops = {
37884 /* .check_mng_mode: mac type dependent */
37885 /* .check_for_link: media type dependent */
37886 .id_led_init = e1000e_id_led_init,
37887@@ -1674,7 +1674,7 @@ static struct e1000_mac_operations e82571_mac_ops = {
37888 .setup_led = e1000e_setup_led_generic,
37889 };
37890
37891-static struct e1000_phy_operations e82_phy_ops_igp = {
37892+static const struct e1000_phy_operations e82_phy_ops_igp = {
37893 .acquire_phy = e1000_get_hw_semaphore_82571,
37894 .check_reset_block = e1000e_check_reset_block_generic,
37895 .commit_phy = NULL,
37896@@ -1691,7 +1691,7 @@ static struct e1000_phy_operations e82_phy_ops_igp = {
37897 .cfg_on_link_up = NULL,
37898 };
37899
37900-static struct e1000_phy_operations e82_phy_ops_m88 = {
37901+static const struct e1000_phy_operations e82_phy_ops_m88 = {
37902 .acquire_phy = e1000_get_hw_semaphore_82571,
37903 .check_reset_block = e1000e_check_reset_block_generic,
37904 .commit_phy = e1000e_phy_sw_reset,
37905@@ -1708,7 +1708,7 @@ static struct e1000_phy_operations e82_phy_ops_m88 = {
37906 .cfg_on_link_up = NULL,
37907 };
37908
37909-static struct e1000_phy_operations e82_phy_ops_bm = {
37910+static const struct e1000_phy_operations e82_phy_ops_bm = {
37911 .acquire_phy = e1000_get_hw_semaphore_82571,
37912 .check_reset_block = e1000e_check_reset_block_generic,
37913 .commit_phy = e1000e_phy_sw_reset,
37914@@ -1725,7 +1725,7 @@ static struct e1000_phy_operations e82_phy_ops_bm = {
37915 .cfg_on_link_up = NULL,
37916 };
37917
37918-static struct e1000_nvm_operations e82571_nvm_ops = {
37919+static const struct e1000_nvm_operations e82571_nvm_ops = {
37920 .acquire_nvm = e1000_acquire_nvm_82571,
37921 .read_nvm = e1000e_read_nvm_eerd,
37922 .release_nvm = e1000_release_nvm_82571,
37923diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
37924index 47db9bd..fa58ccd 100644
37925--- a/drivers/net/e1000e/e1000.h
37926+++ b/drivers/net/e1000e/e1000.h
37927@@ -375,9 +375,9 @@ struct e1000_info {
37928 u32 pba;
37929 u32 max_hw_frame_size;
37930 s32 (*get_variants)(struct e1000_adapter *);
37931- struct e1000_mac_operations *mac_ops;
37932- struct e1000_phy_operations *phy_ops;
37933- struct e1000_nvm_operations *nvm_ops;
37934+ const struct e1000_mac_operations *mac_ops;
37935+ const struct e1000_phy_operations *phy_ops;
37936+ const struct e1000_nvm_operations *nvm_ops;
37937 };
37938
37939 /* hardware capability, feature, and workaround flags */
37940diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
37941index ae5d736..e9a93a1 100644
37942--- a/drivers/net/e1000e/es2lan.c
37943+++ b/drivers/net/e1000e/es2lan.c
37944@@ -207,7 +207,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
37945 {
37946 struct e1000_hw *hw = &adapter->hw;
37947 struct e1000_mac_info *mac = &hw->mac;
37948- struct e1000_mac_operations *func = &mac->ops;
37949+ e1000_mac_operations_no_const *func = &mac->ops;
37950
37951 /* Set media type */
37952 switch (adapter->pdev->device) {
37953@@ -1365,7 +1365,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw)
37954 temp = er32(ICRXDMTC);
37955 }
37956
37957-static struct e1000_mac_operations es2_mac_ops = {
37958+static const struct e1000_mac_operations es2_mac_ops = {
37959 .id_led_init = e1000e_id_led_init,
37960 .check_mng_mode = e1000e_check_mng_mode_generic,
37961 /* check_for_link dependent on media type */
37962@@ -1383,7 +1383,7 @@ static struct e1000_mac_operations es2_mac_ops = {
37963 .setup_led = e1000e_setup_led_generic,
37964 };
37965
37966-static struct e1000_phy_operations es2_phy_ops = {
37967+static const struct e1000_phy_operations es2_phy_ops = {
37968 .acquire_phy = e1000_acquire_phy_80003es2lan,
37969 .check_reset_block = e1000e_check_reset_block_generic,
37970 .commit_phy = e1000e_phy_sw_reset,
37971@@ -1400,7 +1400,7 @@ static struct e1000_phy_operations es2_phy_ops = {
37972 .cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan,
37973 };
37974
37975-static struct e1000_nvm_operations es2_nvm_ops = {
37976+static const struct e1000_nvm_operations es2_nvm_ops = {
37977 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
37978 .read_nvm = e1000e_read_nvm_eerd,
37979 .release_nvm = e1000_release_nvm_80003es2lan,
37980diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
37981index 11f3b7c..6381887 100644
37982--- a/drivers/net/e1000e/hw.h
37983+++ b/drivers/net/e1000e/hw.h
37984@@ -753,6 +753,7 @@ struct e1000_mac_operations {
37985 s32 (*setup_physical_interface)(struct e1000_hw *);
37986 s32 (*setup_led)(struct e1000_hw *);
37987 };
37988+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
37989
37990 /* Function pointers for the PHY. */
37991 struct e1000_phy_operations {
37992@@ -774,6 +775,7 @@ struct e1000_phy_operations {
37993 s32 (*write_phy_reg_locked)(struct e1000_hw *, u32, u16);
37994 s32 (*cfg_on_link_up)(struct e1000_hw *);
37995 };
37996+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
37997
37998 /* Function pointers for the NVM. */
37999 struct e1000_nvm_operations {
38000@@ -785,9 +787,10 @@ struct e1000_nvm_operations {
38001 s32 (*validate_nvm)(struct e1000_hw *);
38002 s32 (*write_nvm)(struct e1000_hw *, u16, u16, u16 *);
38003 };
38004+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
38005
38006 struct e1000_mac_info {
38007- struct e1000_mac_operations ops;
38008+ e1000_mac_operations_no_const ops;
38009
38010 u8 addr[6];
38011 u8 perm_addr[6];
38012@@ -823,7 +826,7 @@ struct e1000_mac_info {
38013 };
38014
38015 struct e1000_phy_info {
38016- struct e1000_phy_operations ops;
38017+ e1000_phy_operations_no_const ops;
38018
38019 enum e1000_phy_type type;
38020
38021@@ -857,7 +860,7 @@ struct e1000_phy_info {
38022 };
38023
38024 struct e1000_nvm_info {
38025- struct e1000_nvm_operations ops;
38026+ e1000_nvm_operations_no_const ops;
38027
38028 enum e1000_nvm_type type;
38029 enum e1000_nvm_override override;
38030diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
38031index de39f9a..e28d3e0 100644
38032--- a/drivers/net/e1000e/ich8lan.c
38033+++ b/drivers/net/e1000e/ich8lan.c
38034@@ -3463,7 +3463,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
38035 }
38036 }
38037
38038-static struct e1000_mac_operations ich8_mac_ops = {
38039+static const struct e1000_mac_operations ich8_mac_ops = {
38040 .id_led_init = e1000e_id_led_init,
38041 .check_mng_mode = e1000_check_mng_mode_ich8lan,
38042 .check_for_link = e1000_check_for_copper_link_ich8lan,
38043@@ -3481,7 +3481,7 @@ static struct e1000_mac_operations ich8_mac_ops = {
38044 /* id_led_init dependent on mac type */
38045 };
38046
38047-static struct e1000_phy_operations ich8_phy_ops = {
38048+static const struct e1000_phy_operations ich8_phy_ops = {
38049 .acquire_phy = e1000_acquire_swflag_ich8lan,
38050 .check_reset_block = e1000_check_reset_block_ich8lan,
38051 .commit_phy = NULL,
38052@@ -3497,7 +3497,7 @@ static struct e1000_phy_operations ich8_phy_ops = {
38053 .write_phy_reg = e1000e_write_phy_reg_igp,
38054 };
38055
38056-static struct e1000_nvm_operations ich8_nvm_ops = {
38057+static const struct e1000_nvm_operations ich8_nvm_ops = {
38058 .acquire_nvm = e1000_acquire_nvm_ich8lan,
38059 .read_nvm = e1000_read_nvm_ich8lan,
38060 .release_nvm = e1000_release_nvm_ich8lan,
38061diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
38062index 18d5fbb..542d96d 100644
38063--- a/drivers/net/fealnx.c
38064+++ b/drivers/net/fealnx.c
38065@@ -151,7 +151,7 @@ struct chip_info {
38066 int flags;
38067 };
38068
38069-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
38070+static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
38071 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
38072 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
38073 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
38074diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
38075index 0e5b54b..b503f82 100644
38076--- a/drivers/net/hamradio/6pack.c
38077+++ b/drivers/net/hamradio/6pack.c
38078@@ -461,6 +461,8 @@ static void sixpack_receive_buf(struct tty_struct *tty,
38079 unsigned char buf[512];
38080 int count1;
38081
38082+ pax_track_stack();
38083+
38084 if (!count)
38085 return;
38086
38087diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
38088index 5862282..7cce8cb 100644
38089--- a/drivers/net/ibmveth.c
38090+++ b/drivers/net/ibmveth.c
38091@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attrs[] = {
38092 NULL,
38093 };
38094
38095-static struct sysfs_ops veth_pool_ops = {
38096+static const struct sysfs_ops veth_pool_ops = {
38097 .show = veth_pool_show,
38098 .store = veth_pool_store,
38099 };
38100diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
38101index d617f2d..57b5309 100644
38102--- a/drivers/net/igb/e1000_82575.c
38103+++ b/drivers/net/igb/e1000_82575.c
38104@@ -1411,7 +1411,7 @@ void igb_vmdq_set_replication_pf(struct e1000_hw *hw, bool enable)
38105 wr32(E1000_VT_CTL, vt_ctl);
38106 }
38107
38108-static struct e1000_mac_operations e1000_mac_ops_82575 = {
38109+static const struct e1000_mac_operations e1000_mac_ops_82575 = {
38110 .reset_hw = igb_reset_hw_82575,
38111 .init_hw = igb_init_hw_82575,
38112 .check_for_link = igb_check_for_link_82575,
38113@@ -1420,13 +1420,13 @@ static struct e1000_mac_operations e1000_mac_ops_82575 = {
38114 .get_speed_and_duplex = igb_get_speed_and_duplex_copper,
38115 };
38116
38117-static struct e1000_phy_operations e1000_phy_ops_82575 = {
38118+static const struct e1000_phy_operations e1000_phy_ops_82575 = {
38119 .acquire = igb_acquire_phy_82575,
38120 .get_cfg_done = igb_get_cfg_done_82575,
38121 .release = igb_release_phy_82575,
38122 };
38123
38124-static struct e1000_nvm_operations e1000_nvm_ops_82575 = {
38125+static const struct e1000_nvm_operations e1000_nvm_ops_82575 = {
38126 .acquire = igb_acquire_nvm_82575,
38127 .read = igb_read_nvm_eerd,
38128 .release = igb_release_nvm_82575,
38129diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
38130index 72081df..d855cf5 100644
38131--- a/drivers/net/igb/e1000_hw.h
38132+++ b/drivers/net/igb/e1000_hw.h
38133@@ -288,6 +288,7 @@ struct e1000_mac_operations {
38134 s32 (*read_mac_addr)(struct e1000_hw *);
38135 s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
38136 };
38137+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
38138
38139 struct e1000_phy_operations {
38140 s32 (*acquire)(struct e1000_hw *);
38141@@ -303,6 +304,7 @@ struct e1000_phy_operations {
38142 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
38143 s32 (*write_reg)(struct e1000_hw *, u32, u16);
38144 };
38145+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
38146
38147 struct e1000_nvm_operations {
38148 s32 (*acquire)(struct e1000_hw *);
38149@@ -310,6 +312,7 @@ struct e1000_nvm_operations {
38150 void (*release)(struct e1000_hw *);
38151 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
38152 };
38153+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
38154
38155 struct e1000_info {
38156 s32 (*get_invariants)(struct e1000_hw *);
38157@@ -321,7 +324,7 @@ struct e1000_info {
38158 extern const struct e1000_info e1000_82575_info;
38159
38160 struct e1000_mac_info {
38161- struct e1000_mac_operations ops;
38162+ e1000_mac_operations_no_const ops;
38163
38164 u8 addr[6];
38165 u8 perm_addr[6];
38166@@ -365,7 +368,7 @@ struct e1000_mac_info {
38167 };
38168
38169 struct e1000_phy_info {
38170- struct e1000_phy_operations ops;
38171+ e1000_phy_operations_no_const ops;
38172
38173 enum e1000_phy_type type;
38174
38175@@ -400,7 +403,7 @@ struct e1000_phy_info {
38176 };
38177
38178 struct e1000_nvm_info {
38179- struct e1000_nvm_operations ops;
38180+ e1000_nvm_operations_no_const ops;
38181
38182 enum e1000_nvm_type type;
38183 enum e1000_nvm_override override;
38184@@ -446,6 +449,7 @@ struct e1000_mbx_operations {
38185 s32 (*check_for_ack)(struct e1000_hw *, u16);
38186 s32 (*check_for_rst)(struct e1000_hw *, u16);
38187 };
38188+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
38189
38190 struct e1000_mbx_stats {
38191 u32 msgs_tx;
38192@@ -457,7 +461,7 @@ struct e1000_mbx_stats {
38193 };
38194
38195 struct e1000_mbx_info {
38196- struct e1000_mbx_operations ops;
38197+ e1000_mbx_operations_no_const ops;
38198 struct e1000_mbx_stats stats;
38199 u32 timeout;
38200 u32 usec_delay;
38201diff --git a/drivers/net/igbvf/vf.h b/drivers/net/igbvf/vf.h
38202index 1e8ce37..549c453 100644
38203--- a/drivers/net/igbvf/vf.h
38204+++ b/drivers/net/igbvf/vf.h
38205@@ -187,9 +187,10 @@ struct e1000_mac_operations {
38206 s32 (*read_mac_addr)(struct e1000_hw *);
38207 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
38208 };
38209+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
38210
38211 struct e1000_mac_info {
38212- struct e1000_mac_operations ops;
38213+ e1000_mac_operations_no_const ops;
38214 u8 addr[6];
38215 u8 perm_addr[6];
38216
38217@@ -211,6 +212,7 @@ struct e1000_mbx_operations {
38218 s32 (*check_for_ack)(struct e1000_hw *);
38219 s32 (*check_for_rst)(struct e1000_hw *);
38220 };
38221+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
38222
38223 struct e1000_mbx_stats {
38224 u32 msgs_tx;
38225@@ -222,7 +224,7 @@ struct e1000_mbx_stats {
38226 };
38227
38228 struct e1000_mbx_info {
38229- struct e1000_mbx_operations ops;
38230+ e1000_mbx_operations_no_const ops;
38231 struct e1000_mbx_stats stats;
38232 u32 timeout;
38233 u32 usec_delay;
38234diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
38235index aa7286b..a61394f 100644
38236--- a/drivers/net/iseries_veth.c
38237+++ b/drivers/net/iseries_veth.c
38238@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_default_attrs[] = {
38239 NULL
38240 };
38241
38242-static struct sysfs_ops veth_cnx_sysfs_ops = {
38243+static const struct sysfs_ops veth_cnx_sysfs_ops = {
38244 .show = veth_cnx_attribute_show
38245 };
38246
38247@@ -441,7 +441,7 @@ static struct attribute *veth_port_default_attrs[] = {
38248 NULL
38249 };
38250
38251-static struct sysfs_ops veth_port_sysfs_ops = {
38252+static const struct sysfs_ops veth_port_sysfs_ops = {
38253 .show = veth_port_attribute_show
38254 };
38255
38256diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
38257index 8aa44dc..fa1e797 100644
38258--- a/drivers/net/ixgb/ixgb_main.c
38259+++ b/drivers/net/ixgb/ixgb_main.c
38260@@ -1052,6 +1052,8 @@ ixgb_set_multi(struct net_device *netdev)
38261 u32 rctl;
38262 int i;
38263
38264+ pax_track_stack();
38265+
38266 /* Check for Promiscuous and All Multicast modes */
38267
38268 rctl = IXGB_READ_REG(hw, RCTL);
38269diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c
38270index af35e1d..8781785 100644
38271--- a/drivers/net/ixgb/ixgb_param.c
38272+++ b/drivers/net/ixgb/ixgb_param.c
38273@@ -260,6 +260,9 @@ void __devinit
38274 ixgb_check_options(struct ixgb_adapter *adapter)
38275 {
38276 int bd = adapter->bd_number;
38277+
38278+ pax_track_stack();
38279+
38280 if (bd >= IXGB_MAX_NIC) {
38281 printk(KERN_NOTICE
38282 "Warning: no configuration for board #%i\n", bd);
38283diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
38284index b17aa73..ed74540 100644
38285--- a/drivers/net/ixgbe/ixgbe_type.h
38286+++ b/drivers/net/ixgbe/ixgbe_type.h
38287@@ -2327,6 +2327,7 @@ struct ixgbe_eeprom_operations {
38288 s32 (*validate_checksum)(struct ixgbe_hw *, u16 *);
38289 s32 (*update_checksum)(struct ixgbe_hw *);
38290 };
38291+typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
38292
38293 struct ixgbe_mac_operations {
38294 s32 (*init_hw)(struct ixgbe_hw *);
38295@@ -2376,6 +2377,7 @@ struct ixgbe_mac_operations {
38296 /* Flow Control */
38297 s32 (*fc_enable)(struct ixgbe_hw *, s32);
38298 };
38299+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
38300
38301 struct ixgbe_phy_operations {
38302 s32 (*identify)(struct ixgbe_hw *);
38303@@ -2394,9 +2396,10 @@ struct ixgbe_phy_operations {
38304 s32 (*read_i2c_eeprom)(struct ixgbe_hw *, u8 , u8 *);
38305 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
38306 };
38307+typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
38308
38309 struct ixgbe_eeprom_info {
38310- struct ixgbe_eeprom_operations ops;
38311+ ixgbe_eeprom_operations_no_const ops;
38312 enum ixgbe_eeprom_type type;
38313 u32 semaphore_delay;
38314 u16 word_size;
38315@@ -2404,7 +2407,7 @@ struct ixgbe_eeprom_info {
38316 };
38317
38318 struct ixgbe_mac_info {
38319- struct ixgbe_mac_operations ops;
38320+ ixgbe_mac_operations_no_const ops;
38321 enum ixgbe_mac_type type;
38322 u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
38323 u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
38324@@ -2423,7 +2426,7 @@ struct ixgbe_mac_info {
38325 };
38326
38327 struct ixgbe_phy_info {
38328- struct ixgbe_phy_operations ops;
38329+ ixgbe_phy_operations_no_const ops;
38330 struct mdio_if_info mdio;
38331 enum ixgbe_phy_type type;
38332 u32 id;
38333diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
38334index 291a505..2543756 100644
38335--- a/drivers/net/mlx4/main.c
38336+++ b/drivers/net/mlx4/main.c
38337@@ -38,6 +38,7 @@
38338 #include <linux/errno.h>
38339 #include <linux/pci.h>
38340 #include <linux/dma-mapping.h>
38341+#include <linux/sched.h>
38342
38343 #include <linux/mlx4/device.h>
38344 #include <linux/mlx4/doorbell.h>
38345@@ -730,6 +731,8 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
38346 u64 icm_size;
38347 int err;
38348
38349+ pax_track_stack();
38350+
38351 err = mlx4_QUERY_FW(dev);
38352 if (err) {
38353 if (err == -EACCES)
38354diff --git a/drivers/net/niu.c b/drivers/net/niu.c
38355index 2dce134..fa5ce75 100644
38356--- a/drivers/net/niu.c
38357+++ b/drivers/net/niu.c
38358@@ -9128,6 +9128,8 @@ static void __devinit niu_try_msix(struct niu *np, u8 *ldg_num_map)
38359 int i, num_irqs, err;
38360 u8 first_ldg;
38361
38362+ pax_track_stack();
38363+
38364 first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port;
38365 for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++)
38366 ldg_num_map[i] = first_ldg + i;
38367diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
38368index c1b3f09..97cd8c4 100644
38369--- a/drivers/net/pcnet32.c
38370+++ b/drivers/net/pcnet32.c
38371@@ -79,7 +79,7 @@ static int cards_found;
38372 /*
38373 * VLB I/O addresses
38374 */
38375-static unsigned int pcnet32_portlist[] __initdata =
38376+static unsigned int pcnet32_portlist[] __devinitdata =
38377 { 0x300, 0x320, 0x340, 0x360, 0 };
38378
38379 static int pcnet32_debug = 0;
38380@@ -267,7 +267,7 @@ struct pcnet32_private {
38381 struct sk_buff **rx_skbuff;
38382 dma_addr_t *tx_dma_addr;
38383 dma_addr_t *rx_dma_addr;
38384- struct pcnet32_access a;
38385+ struct pcnet32_access *a;
38386 spinlock_t lock; /* Guard lock */
38387 unsigned int cur_rx, cur_tx; /* The next free ring entry */
38388 unsigned int rx_ring_size; /* current rx ring size */
38389@@ -457,9 +457,9 @@ static void pcnet32_netif_start(struct net_device *dev)
38390 u16 val;
38391
38392 netif_wake_queue(dev);
38393- val = lp->a.read_csr(ioaddr, CSR3);
38394+ val = lp->a->read_csr(ioaddr, CSR3);
38395 val &= 0x00ff;
38396- lp->a.write_csr(ioaddr, CSR3, val);
38397+ lp->a->write_csr(ioaddr, CSR3, val);
38398 napi_enable(&lp->napi);
38399 }
38400
38401@@ -744,7 +744,7 @@ static u32 pcnet32_get_link(struct net_device *dev)
38402 r = mii_link_ok(&lp->mii_if);
38403 } else if (lp->chip_version >= PCNET32_79C970A) {
38404 ulong ioaddr = dev->base_addr; /* card base I/O address */
38405- r = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
38406+ r = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
38407 } else { /* can not detect link on really old chips */
38408 r = 1;
38409 }
38410@@ -806,7 +806,7 @@ static int pcnet32_set_ringparam(struct net_device *dev,
38411 pcnet32_netif_stop(dev);
38412
38413 spin_lock_irqsave(&lp->lock, flags);
38414- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
38415+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
38416
38417 size = min(ering->tx_pending, (unsigned int)TX_MAX_RING_SIZE);
38418
38419@@ -886,7 +886,7 @@ static void pcnet32_ethtool_test(struct net_device *dev,
38420 static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38421 {
38422 struct pcnet32_private *lp = netdev_priv(dev);
38423- struct pcnet32_access *a = &lp->a; /* access to registers */
38424+ struct pcnet32_access *a = lp->a; /* access to registers */
38425 ulong ioaddr = dev->base_addr; /* card base I/O address */
38426 struct sk_buff *skb; /* sk buff */
38427 int x, i; /* counters */
38428@@ -906,21 +906,21 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38429 pcnet32_netif_stop(dev);
38430
38431 spin_lock_irqsave(&lp->lock, flags);
38432- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
38433+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
38434
38435 numbuffs = min(numbuffs, (int)min(lp->rx_ring_size, lp->tx_ring_size));
38436
38437 /* Reset the PCNET32 */
38438- lp->a.reset(ioaddr);
38439- lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38440+ lp->a->reset(ioaddr);
38441+ lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38442
38443 /* switch pcnet32 to 32bit mode */
38444- lp->a.write_bcr(ioaddr, 20, 2);
38445+ lp->a->write_bcr(ioaddr, 20, 2);
38446
38447 /* purge & init rings but don't actually restart */
38448 pcnet32_restart(dev, 0x0000);
38449
38450- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
38451+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
38452
38453 /* Initialize Transmit buffers. */
38454 size = data_len + 15;
38455@@ -966,10 +966,10 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38456
38457 /* set int loopback in CSR15 */
38458 x = a->read_csr(ioaddr, CSR15) & 0xfffc;
38459- lp->a.write_csr(ioaddr, CSR15, x | 0x0044);
38460+ lp->a->write_csr(ioaddr, CSR15, x | 0x0044);
38461
38462 teststatus = cpu_to_le16(0x8000);
38463- lp->a.write_csr(ioaddr, CSR0, CSR0_START); /* Set STRT bit */
38464+ lp->a->write_csr(ioaddr, CSR0, CSR0_START); /* Set STRT bit */
38465
38466 /* Check status of descriptors */
38467 for (x = 0; x < numbuffs; x++) {
38468@@ -990,7 +990,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38469 }
38470 }
38471
38472- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
38473+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
38474 wmb();
38475 if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) {
38476 printk(KERN_DEBUG "%s: RX loopback packets:\n", dev->name);
38477@@ -1039,7 +1039,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38478 pcnet32_restart(dev, CSR0_NORMAL);
38479 } else {
38480 pcnet32_purge_rx_ring(dev);
38481- lp->a.write_bcr(ioaddr, 20, 4); /* return to 16bit mode */
38482+ lp->a->write_bcr(ioaddr, 20, 4); /* return to 16bit mode */
38483 }
38484 spin_unlock_irqrestore(&lp->lock, flags);
38485
38486@@ -1049,7 +1049,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38487 static void pcnet32_led_blink_callback(struct net_device *dev)
38488 {
38489 struct pcnet32_private *lp = netdev_priv(dev);
38490- struct pcnet32_access *a = &lp->a;
38491+ struct pcnet32_access *a = lp->a;
38492 ulong ioaddr = dev->base_addr;
38493 unsigned long flags;
38494 int i;
38495@@ -1066,7 +1066,7 @@ static void pcnet32_led_blink_callback(struct net_device *dev)
38496 static int pcnet32_phys_id(struct net_device *dev, u32 data)
38497 {
38498 struct pcnet32_private *lp = netdev_priv(dev);
38499- struct pcnet32_access *a = &lp->a;
38500+ struct pcnet32_access *a = lp->a;
38501 ulong ioaddr = dev->base_addr;
38502 unsigned long flags;
38503 int i, regs[4];
38504@@ -1112,7 +1112,7 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
38505 {
38506 int csr5;
38507 struct pcnet32_private *lp = netdev_priv(dev);
38508- struct pcnet32_access *a = &lp->a;
38509+ struct pcnet32_access *a = lp->a;
38510 ulong ioaddr = dev->base_addr;
38511 int ticks;
38512
38513@@ -1388,8 +1388,8 @@ static int pcnet32_poll(struct napi_struct *napi, int budget)
38514 spin_lock_irqsave(&lp->lock, flags);
38515 if (pcnet32_tx(dev)) {
38516 /* reset the chip to clear the error condition, then restart */
38517- lp->a.reset(ioaddr);
38518- lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38519+ lp->a->reset(ioaddr);
38520+ lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38521 pcnet32_restart(dev, CSR0_START);
38522 netif_wake_queue(dev);
38523 }
38524@@ -1401,12 +1401,12 @@ static int pcnet32_poll(struct napi_struct *napi, int budget)
38525 __napi_complete(napi);
38526
38527 /* clear interrupt masks */
38528- val = lp->a.read_csr(ioaddr, CSR3);
38529+ val = lp->a->read_csr(ioaddr, CSR3);
38530 val &= 0x00ff;
38531- lp->a.write_csr(ioaddr, CSR3, val);
38532+ lp->a->write_csr(ioaddr, CSR3, val);
38533
38534 /* Set interrupt enable. */
38535- lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
38536+ lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN);
38537
38538 spin_unlock_irqrestore(&lp->lock, flags);
38539 }
38540@@ -1429,7 +1429,7 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
38541 int i, csr0;
38542 u16 *buff = ptr;
38543 struct pcnet32_private *lp = netdev_priv(dev);
38544- struct pcnet32_access *a = &lp->a;
38545+ struct pcnet32_access *a = lp->a;
38546 ulong ioaddr = dev->base_addr;
38547 unsigned long flags;
38548
38549@@ -1466,9 +1466,9 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
38550 for (j = 0; j < PCNET32_MAX_PHYS; j++) {
38551 if (lp->phymask & (1 << j)) {
38552 for (i = 0; i < PCNET32_REGS_PER_PHY; i++) {
38553- lp->a.write_bcr(ioaddr, 33,
38554+ lp->a->write_bcr(ioaddr, 33,
38555 (j << 5) | i);
38556- *buff++ = lp->a.read_bcr(ioaddr, 34);
38557+ *buff++ = lp->a->read_bcr(ioaddr, 34);
38558 }
38559 }
38560 }
38561@@ -1858,7 +1858,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
38562 ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
38563 lp->options |= PCNET32_PORT_FD;
38564
38565- lp->a = *a;
38566+ lp->a = a;
38567
38568 /* prior to register_netdev, dev->name is not yet correct */
38569 if (pcnet32_alloc_ring(dev, pci_name(lp->pci_dev))) {
38570@@ -1917,7 +1917,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
38571 if (lp->mii) {
38572 /* lp->phycount and lp->phymask are set to 0 by memset above */
38573
38574- lp->mii_if.phy_id = ((lp->a.read_bcr(ioaddr, 33)) >> 5) & 0x1f;
38575+ lp->mii_if.phy_id = ((lp->a->read_bcr(ioaddr, 33)) >> 5) & 0x1f;
38576 /* scan for PHYs */
38577 for (i = 0; i < PCNET32_MAX_PHYS; i++) {
38578 unsigned short id1, id2;
38579@@ -1938,7 +1938,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
38580 "Found PHY %04x:%04x at address %d.\n",
38581 id1, id2, i);
38582 }
38583- lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
38584+ lp->a->write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
38585 if (lp->phycount > 1) {
38586 lp->options |= PCNET32_PORT_MII;
38587 }
38588@@ -2109,10 +2109,10 @@ static int pcnet32_open(struct net_device *dev)
38589 }
38590
38591 /* Reset the PCNET32 */
38592- lp->a.reset(ioaddr);
38593+ lp->a->reset(ioaddr);
38594
38595 /* switch pcnet32 to 32bit mode */
38596- lp->a.write_bcr(ioaddr, 20, 2);
38597+ lp->a->write_bcr(ioaddr, 20, 2);
38598
38599 if (netif_msg_ifup(lp))
38600 printk(KERN_DEBUG
38601@@ -2122,14 +2122,14 @@ static int pcnet32_open(struct net_device *dev)
38602 (u32) (lp->init_dma_addr));
38603
38604 /* set/reset autoselect bit */
38605- val = lp->a.read_bcr(ioaddr, 2) & ~2;
38606+ val = lp->a->read_bcr(ioaddr, 2) & ~2;
38607 if (lp->options & PCNET32_PORT_ASEL)
38608 val |= 2;
38609- lp->a.write_bcr(ioaddr, 2, val);
38610+ lp->a->write_bcr(ioaddr, 2, val);
38611
38612 /* handle full duplex setting */
38613 if (lp->mii_if.full_duplex) {
38614- val = lp->a.read_bcr(ioaddr, 9) & ~3;
38615+ val = lp->a->read_bcr(ioaddr, 9) & ~3;
38616 if (lp->options & PCNET32_PORT_FD) {
38617 val |= 1;
38618 if (lp->options == (PCNET32_PORT_FD | PCNET32_PORT_AUI))
38619@@ -2139,14 +2139,14 @@ static int pcnet32_open(struct net_device *dev)
38620 if (lp->chip_version == 0x2627)
38621 val |= 3;
38622 }
38623- lp->a.write_bcr(ioaddr, 9, val);
38624+ lp->a->write_bcr(ioaddr, 9, val);
38625 }
38626
38627 /* set/reset GPSI bit in test register */
38628- val = lp->a.read_csr(ioaddr, 124) & ~0x10;
38629+ val = lp->a->read_csr(ioaddr, 124) & ~0x10;
38630 if ((lp->options & PCNET32_PORT_PORTSEL) == PCNET32_PORT_GPSI)
38631 val |= 0x10;
38632- lp->a.write_csr(ioaddr, 124, val);
38633+ lp->a->write_csr(ioaddr, 124, val);
38634
38635 /* Allied Telesyn AT 2700/2701 FX are 100Mbit only and do not negotiate */
38636 if (pdev && pdev->subsystem_vendor == PCI_VENDOR_ID_AT &&
38637@@ -2167,24 +2167,24 @@ static int pcnet32_open(struct net_device *dev)
38638 * duplex, and/or enable auto negotiation, and clear DANAS
38639 */
38640 if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) {
38641- lp->a.write_bcr(ioaddr, 32,
38642- lp->a.read_bcr(ioaddr, 32) | 0x0080);
38643+ lp->a->write_bcr(ioaddr, 32,
38644+ lp->a->read_bcr(ioaddr, 32) | 0x0080);
38645 /* disable Auto Negotiation, set 10Mpbs, HD */
38646- val = lp->a.read_bcr(ioaddr, 32) & ~0xb8;
38647+ val = lp->a->read_bcr(ioaddr, 32) & ~0xb8;
38648 if (lp->options & PCNET32_PORT_FD)
38649 val |= 0x10;
38650 if (lp->options & PCNET32_PORT_100)
38651 val |= 0x08;
38652- lp->a.write_bcr(ioaddr, 32, val);
38653+ lp->a->write_bcr(ioaddr, 32, val);
38654 } else {
38655 if (lp->options & PCNET32_PORT_ASEL) {
38656- lp->a.write_bcr(ioaddr, 32,
38657- lp->a.read_bcr(ioaddr,
38658+ lp->a->write_bcr(ioaddr, 32,
38659+ lp->a->read_bcr(ioaddr,
38660 32) | 0x0080);
38661 /* enable auto negotiate, setup, disable fd */
38662- val = lp->a.read_bcr(ioaddr, 32) & ~0x98;
38663+ val = lp->a->read_bcr(ioaddr, 32) & ~0x98;
38664 val |= 0x20;
38665- lp->a.write_bcr(ioaddr, 32, val);
38666+ lp->a->write_bcr(ioaddr, 32, val);
38667 }
38668 }
38669 } else {
38670@@ -2197,10 +2197,10 @@ static int pcnet32_open(struct net_device *dev)
38671 * There is really no good other way to handle multiple PHYs
38672 * other than turning off all automatics
38673 */
38674- val = lp->a.read_bcr(ioaddr, 2);
38675- lp->a.write_bcr(ioaddr, 2, val & ~2);
38676- val = lp->a.read_bcr(ioaddr, 32);
38677- lp->a.write_bcr(ioaddr, 32, val & ~(1 << 7)); /* stop MII manager */
38678+ val = lp->a->read_bcr(ioaddr, 2);
38679+ lp->a->write_bcr(ioaddr, 2, val & ~2);
38680+ val = lp->a->read_bcr(ioaddr, 32);
38681+ lp->a->write_bcr(ioaddr, 32, val & ~(1 << 7)); /* stop MII manager */
38682
38683 if (!(lp->options & PCNET32_PORT_ASEL)) {
38684 /* setup ecmd */
38685@@ -2210,7 +2210,7 @@ static int pcnet32_open(struct net_device *dev)
38686 ecmd.speed =
38687 lp->
38688 options & PCNET32_PORT_100 ? SPEED_100 : SPEED_10;
38689- bcr9 = lp->a.read_bcr(ioaddr, 9);
38690+ bcr9 = lp->a->read_bcr(ioaddr, 9);
38691
38692 if (lp->options & PCNET32_PORT_FD) {
38693 ecmd.duplex = DUPLEX_FULL;
38694@@ -2219,7 +2219,7 @@ static int pcnet32_open(struct net_device *dev)
38695 ecmd.duplex = DUPLEX_HALF;
38696 bcr9 |= ~(1 << 0);
38697 }
38698- lp->a.write_bcr(ioaddr, 9, bcr9);
38699+ lp->a->write_bcr(ioaddr, 9, bcr9);
38700 }
38701
38702 for (i = 0; i < PCNET32_MAX_PHYS; i++) {
38703@@ -2252,9 +2252,9 @@ static int pcnet32_open(struct net_device *dev)
38704
38705 #ifdef DO_DXSUFLO
38706 if (lp->dxsuflo) { /* Disable transmit stop on underflow */
38707- val = lp->a.read_csr(ioaddr, CSR3);
38708+ val = lp->a->read_csr(ioaddr, CSR3);
38709 val |= 0x40;
38710- lp->a.write_csr(ioaddr, CSR3, val);
38711+ lp->a->write_csr(ioaddr, CSR3, val);
38712 }
38713 #endif
38714
38715@@ -2270,11 +2270,11 @@ static int pcnet32_open(struct net_device *dev)
38716 napi_enable(&lp->napi);
38717
38718 /* Re-initialize the PCNET32, and start it when done. */
38719- lp->a.write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
38720- lp->a.write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
38721+ lp->a->write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
38722+ lp->a->write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
38723
38724- lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38725- lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
38726+ lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38727+ lp->a->write_csr(ioaddr, CSR0, CSR0_INIT);
38728
38729 netif_start_queue(dev);
38730
38731@@ -2286,20 +2286,20 @@ static int pcnet32_open(struct net_device *dev)
38732
38733 i = 0;
38734 while (i++ < 100)
38735- if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
38736+ if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON)
38737 break;
38738 /*
38739 * We used to clear the InitDone bit, 0x0100, here but Mark Stockton
38740 * reports that doing so triggers a bug in the '974.
38741 */
38742- lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL);
38743+ lp->a->write_csr(ioaddr, CSR0, CSR0_NORMAL);
38744
38745 if (netif_msg_ifup(lp))
38746 printk(KERN_DEBUG
38747 "%s: pcnet32 open after %d ticks, init block %#x csr0 %4.4x.\n",
38748 dev->name, i,
38749 (u32) (lp->init_dma_addr),
38750- lp->a.read_csr(ioaddr, CSR0));
38751+ lp->a->read_csr(ioaddr, CSR0));
38752
38753 spin_unlock_irqrestore(&lp->lock, flags);
38754
38755@@ -2313,7 +2313,7 @@ static int pcnet32_open(struct net_device *dev)
38756 * Switch back to 16bit mode to avoid problems with dumb
38757 * DOS packet driver after a warm reboot
38758 */
38759- lp->a.write_bcr(ioaddr, 20, 4);
38760+ lp->a->write_bcr(ioaddr, 20, 4);
38761
38762 err_free_irq:
38763 spin_unlock_irqrestore(&lp->lock, flags);
38764@@ -2420,7 +2420,7 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
38765
38766 /* wait for stop */
38767 for (i = 0; i < 100; i++)
38768- if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
38769+ if (lp->a->read_csr(ioaddr, CSR0) & CSR0_STOP)
38770 break;
38771
38772 if (i >= 100 && netif_msg_drv(lp))
38773@@ -2433,13 +2433,13 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
38774 return;
38775
38776 /* ReInit Ring */
38777- lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
38778+ lp->a->write_csr(ioaddr, CSR0, CSR0_INIT);
38779 i = 0;
38780 while (i++ < 1000)
38781- if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
38782+ if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON)
38783 break;
38784
38785- lp->a.write_csr(ioaddr, CSR0, csr0_bits);
38786+ lp->a->write_csr(ioaddr, CSR0, csr0_bits);
38787 }
38788
38789 static void pcnet32_tx_timeout(struct net_device *dev)
38790@@ -2452,8 +2452,8 @@ static void pcnet32_tx_timeout(struct net_device *dev)
38791 if (pcnet32_debug & NETIF_MSG_DRV)
38792 printk(KERN_ERR
38793 "%s: transmit timed out, status %4.4x, resetting.\n",
38794- dev->name, lp->a.read_csr(ioaddr, CSR0));
38795- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
38796+ dev->name, lp->a->read_csr(ioaddr, CSR0));
38797+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
38798 dev->stats.tx_errors++;
38799 if (netif_msg_tx_err(lp)) {
38800 int i;
38801@@ -2497,7 +2497,7 @@ static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb,
38802 if (netif_msg_tx_queued(lp)) {
38803 printk(KERN_DEBUG
38804 "%s: pcnet32_start_xmit() called, csr0 %4.4x.\n",
38805- dev->name, lp->a.read_csr(ioaddr, CSR0));
38806+ dev->name, lp->a->read_csr(ioaddr, CSR0));
38807 }
38808
38809 /* Default status -- will not enable Successful-TxDone
38810@@ -2528,7 +2528,7 @@ static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb,
38811 dev->stats.tx_bytes += skb->len;
38812
38813 /* Trigger an immediate send poll. */
38814- lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
38815+ lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
38816
38817 dev->trans_start = jiffies;
38818
38819@@ -2555,18 +2555,18 @@ pcnet32_interrupt(int irq, void *dev_id)
38820
38821 spin_lock(&lp->lock);
38822
38823- csr0 = lp->a.read_csr(ioaddr, CSR0);
38824+ csr0 = lp->a->read_csr(ioaddr, CSR0);
38825 while ((csr0 & 0x8f00) && --boguscnt >= 0) {
38826 if (csr0 == 0xffff) {
38827 break; /* PCMCIA remove happened */
38828 }
38829 /* Acknowledge all of the current interrupt sources ASAP. */
38830- lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f);
38831+ lp->a->write_csr(ioaddr, CSR0, csr0 & ~0x004f);
38832
38833 if (netif_msg_intr(lp))
38834 printk(KERN_DEBUG
38835 "%s: interrupt csr0=%#2.2x new csr=%#2.2x.\n",
38836- dev->name, csr0, lp->a.read_csr(ioaddr, CSR0));
38837+ dev->name, csr0, lp->a->read_csr(ioaddr, CSR0));
38838
38839 /* Log misc errors. */
38840 if (csr0 & 0x4000)
38841@@ -2595,19 +2595,19 @@ pcnet32_interrupt(int irq, void *dev_id)
38842 if (napi_schedule_prep(&lp->napi)) {
38843 u16 val;
38844 /* set interrupt masks */
38845- val = lp->a.read_csr(ioaddr, CSR3);
38846+ val = lp->a->read_csr(ioaddr, CSR3);
38847 val |= 0x5f00;
38848- lp->a.write_csr(ioaddr, CSR3, val);
38849+ lp->a->write_csr(ioaddr, CSR3, val);
38850
38851 __napi_schedule(&lp->napi);
38852 break;
38853 }
38854- csr0 = lp->a.read_csr(ioaddr, CSR0);
38855+ csr0 = lp->a->read_csr(ioaddr, CSR0);
38856 }
38857
38858 if (netif_msg_intr(lp))
38859 printk(KERN_DEBUG "%s: exiting interrupt, csr0=%#4.4x.\n",
38860- dev->name, lp->a.read_csr(ioaddr, CSR0));
38861+ dev->name, lp->a->read_csr(ioaddr, CSR0));
38862
38863 spin_unlock(&lp->lock);
38864
38865@@ -2627,21 +2627,21 @@ static int pcnet32_close(struct net_device *dev)
38866
38867 spin_lock_irqsave(&lp->lock, flags);
38868
38869- dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
38870+ dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
38871
38872 if (netif_msg_ifdown(lp))
38873 printk(KERN_DEBUG
38874 "%s: Shutting down ethercard, status was %2.2x.\n",
38875- dev->name, lp->a.read_csr(ioaddr, CSR0));
38876+ dev->name, lp->a->read_csr(ioaddr, CSR0));
38877
38878 /* We stop the PCNET32 here -- it occasionally polls memory if we don't. */
38879- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
38880+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
38881
38882 /*
38883 * Switch back to 16bit mode to avoid problems with dumb
38884 * DOS packet driver after a warm reboot
38885 */
38886- lp->a.write_bcr(ioaddr, 20, 4);
38887+ lp->a->write_bcr(ioaddr, 20, 4);
38888
38889 spin_unlock_irqrestore(&lp->lock, flags);
38890
38891@@ -2664,7 +2664,7 @@ static struct net_device_stats *pcnet32_get_stats(struct net_device *dev)
38892 unsigned long flags;
38893
38894 spin_lock_irqsave(&lp->lock, flags);
38895- dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
38896+ dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
38897 spin_unlock_irqrestore(&lp->lock, flags);
38898
38899 return &dev->stats;
38900@@ -2686,10 +2686,10 @@ static void pcnet32_load_multicast(struct net_device *dev)
38901 if (dev->flags & IFF_ALLMULTI) {
38902 ib->filter[0] = cpu_to_le32(~0U);
38903 ib->filter[1] = cpu_to_le32(~0U);
38904- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
38905- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
38906- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
38907- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
38908+ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
38909+ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
38910+ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
38911+ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
38912 return;
38913 }
38914 /* clear the multicast filter */
38915@@ -2710,7 +2710,7 @@ static void pcnet32_load_multicast(struct net_device *dev)
38916 mcast_table[crc >> 4] |= cpu_to_le16(1 << (crc & 0xf));
38917 }
38918 for (i = 0; i < 4; i++)
38919- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
38920+ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER + i,
38921 le16_to_cpu(mcast_table[i]));
38922 return;
38923 }
38924@@ -2726,7 +2726,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
38925
38926 spin_lock_irqsave(&lp->lock, flags);
38927 suspended = pcnet32_suspend(dev, &flags, 0);
38928- csr15 = lp->a.read_csr(ioaddr, CSR15);
38929+ csr15 = lp->a->read_csr(ioaddr, CSR15);
38930 if (dev->flags & IFF_PROMISC) {
38931 /* Log any net taps. */
38932 if (netif_msg_hw(lp))
38933@@ -2735,21 +2735,21 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
38934 lp->init_block->mode =
38935 cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
38936 7);
38937- lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000);
38938+ lp->a->write_csr(ioaddr, CSR15, csr15 | 0x8000);
38939 } else {
38940 lp->init_block->mode =
38941 cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7);
38942- lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff);
38943+ lp->a->write_csr(ioaddr, CSR15, csr15 & 0x7fff);
38944 pcnet32_load_multicast(dev);
38945 }
38946
38947 if (suspended) {
38948 int csr5;
38949 /* clear SUSPEND (SPND) - CSR5 bit 0 */
38950- csr5 = lp->a.read_csr(ioaddr, CSR5);
38951- lp->a.write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
38952+ csr5 = lp->a->read_csr(ioaddr, CSR5);
38953+ lp->a->write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
38954 } else {
38955- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
38956+ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
38957 pcnet32_restart(dev, CSR0_NORMAL);
38958 netif_wake_queue(dev);
38959 }
38960@@ -2767,8 +2767,8 @@ static int mdio_read(struct net_device *dev, int phy_id, int reg_num)
38961 if (!lp->mii)
38962 return 0;
38963
38964- lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
38965- val_out = lp->a.read_bcr(ioaddr, 34);
38966+ lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
38967+ val_out = lp->a->read_bcr(ioaddr, 34);
38968
38969 return val_out;
38970 }
38971@@ -2782,8 +2782,8 @@ static void mdio_write(struct net_device *dev, int phy_id, int reg_num, int val)
38972 if (!lp->mii)
38973 return;
38974
38975- lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
38976- lp->a.write_bcr(ioaddr, 34, val);
38977+ lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
38978+ lp->a->write_bcr(ioaddr, 34, val);
38979 }
38980
38981 static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
38982@@ -2862,7 +2862,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
38983 curr_link = mii_link_ok(&lp->mii_if);
38984 } else {
38985 ulong ioaddr = dev->base_addr; /* card base I/O address */
38986- curr_link = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
38987+ curr_link = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
38988 }
38989 if (!curr_link) {
38990 if (prev_link || verbose) {
38991@@ -2887,13 +2887,13 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
38992 (ecmd.duplex ==
38993 DUPLEX_FULL) ? "full" : "half");
38994 }
38995- bcr9 = lp->a.read_bcr(dev->base_addr, 9);
38996+ bcr9 = lp->a->read_bcr(dev->base_addr, 9);
38997 if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) {
38998 if (lp->mii_if.full_duplex)
38999 bcr9 |= (1 << 0);
39000 else
39001 bcr9 &= ~(1 << 0);
39002- lp->a.write_bcr(dev->base_addr, 9, bcr9);
39003+ lp->a->write_bcr(dev->base_addr, 9, bcr9);
39004 }
39005 } else {
39006 if (netif_msg_link(lp))
39007diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
39008index 7cc9898..6eb50d3 100644
39009--- a/drivers/net/sis190.c
39010+++ b/drivers/net/sis190.c
39011@@ -1598,7 +1598,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
39012 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
39013 struct net_device *dev)
39014 {
39015- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
39016+ static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
39017 struct sis190_private *tp = netdev_priv(dev);
39018 struct pci_dev *isa_bridge;
39019 u8 reg, tmp8;
39020diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
39021index e13685a..60c948c 100644
39022--- a/drivers/net/sundance.c
39023+++ b/drivers/net/sundance.c
39024@@ -225,7 +225,7 @@ enum {
39025 struct pci_id_info {
39026 const char *name;
39027 };
39028-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
39029+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
39030 {"D-Link DFE-550TX FAST Ethernet Adapter"},
39031 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
39032 {"D-Link DFE-580TX 4 port Server Adapter"},
39033diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
39034index 529f55a..cccaa18 100644
39035--- a/drivers/net/tg3.h
39036+++ b/drivers/net/tg3.h
39037@@ -95,6 +95,7 @@
39038 #define CHIPREV_ID_5750_A0 0x4000
39039 #define CHIPREV_ID_5750_A1 0x4001
39040 #define CHIPREV_ID_5750_A3 0x4003
39041+#define CHIPREV_ID_5750_C1 0x4201
39042 #define CHIPREV_ID_5750_C2 0x4202
39043 #define CHIPREV_ID_5752_A0_HW 0x5000
39044 #define CHIPREV_ID_5752_A0 0x6000
39045diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
39046index b9db1b5..720f9ce 100644
39047--- a/drivers/net/tokenring/abyss.c
39048+++ b/drivers/net/tokenring/abyss.c
39049@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = {
39050
39051 static int __init abyss_init (void)
39052 {
39053- abyss_netdev_ops = tms380tr_netdev_ops;
39054+ pax_open_kernel();
39055+ memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
39056
39057- abyss_netdev_ops.ndo_open = abyss_open;
39058- abyss_netdev_ops.ndo_stop = abyss_close;
39059+ *(void **)&abyss_netdev_ops.ndo_open = abyss_open;
39060+ *(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
39061+ pax_close_kernel();
39062
39063 return pci_register_driver(&abyss_driver);
39064 }
39065diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
39066index 456f8bf..373e56d 100644
39067--- a/drivers/net/tokenring/madgemc.c
39068+++ b/drivers/net/tokenring/madgemc.c
39069@@ -755,9 +755,11 @@ static struct mca_driver madgemc_driver = {
39070
39071 static int __init madgemc_init (void)
39072 {
39073- madgemc_netdev_ops = tms380tr_netdev_ops;
39074- madgemc_netdev_ops.ndo_open = madgemc_open;
39075- madgemc_netdev_ops.ndo_stop = madgemc_close;
39076+ pax_open_kernel();
39077+ memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
39078+ *(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
39079+ *(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
39080+ pax_close_kernel();
39081
39082 return mca_register_driver (&madgemc_driver);
39083 }
39084diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
39085index 16e8783..925bd49 100644
39086--- a/drivers/net/tokenring/proteon.c
39087+++ b/drivers/net/tokenring/proteon.c
39088@@ -353,9 +353,11 @@ static int __init proteon_init(void)
39089 struct platform_device *pdev;
39090 int i, num = 0, err = 0;
39091
39092- proteon_netdev_ops = tms380tr_netdev_ops;
39093- proteon_netdev_ops.ndo_open = proteon_open;
39094- proteon_netdev_ops.ndo_stop = tms380tr_close;
39095+ pax_open_kernel();
39096+ memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
39097+ *(void **)&proteon_netdev_ops.ndo_open = proteon_open;
39098+ *(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
39099+ pax_close_kernel();
39100
39101 err = platform_driver_register(&proteon_driver);
39102 if (err)
39103diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
39104index 46db5c5..37c1536 100644
39105--- a/drivers/net/tokenring/skisa.c
39106+++ b/drivers/net/tokenring/skisa.c
39107@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
39108 struct platform_device *pdev;
39109 int i, num = 0, err = 0;
39110
39111- sk_isa_netdev_ops = tms380tr_netdev_ops;
39112- sk_isa_netdev_ops.ndo_open = sk_isa_open;
39113- sk_isa_netdev_ops.ndo_stop = tms380tr_close;
39114+ pax_open_kernel();
39115+ memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
39116+ *(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
39117+ *(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
39118+ pax_close_kernel();
39119
39120 err = platform_driver_register(&sk_isa_driver);
39121 if (err)
39122diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
39123index 74e5ba4..5cf6bc9 100644
39124--- a/drivers/net/tulip/de2104x.c
39125+++ b/drivers/net/tulip/de2104x.c
39126@@ -1785,6 +1785,8 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
39127 struct de_srom_info_leaf *il;
39128 void *bufp;
39129
39130+ pax_track_stack();
39131+
39132 /* download entire eeprom */
39133 for (i = 0; i < DE_EEPROM_WORDS; i++)
39134 ((__le16 *)ee_data)[i] =
39135diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
39136index a8349b7..90f9dfe 100644
39137--- a/drivers/net/tulip/de4x5.c
39138+++ b/drivers/net/tulip/de4x5.c
39139@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
39140 for (i=0; i<ETH_ALEN; i++) {
39141 tmp.addr[i] = dev->dev_addr[i];
39142 }
39143- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
39144+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
39145 break;
39146
39147 case DE4X5_SET_HWADDR: /* Set the hardware address */
39148@@ -5512,7 +5512,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
39149 spin_lock_irqsave(&lp->lock, flags);
39150 memcpy(&statbuf, &lp->pktStats, ioc->len);
39151 spin_unlock_irqrestore(&lp->lock, flags);
39152- if (copy_to_user(ioc->data, &statbuf, ioc->len))
39153+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
39154 return -EFAULT;
39155 break;
39156 }
39157diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
39158index 391acd3..56d11cd 100644
39159--- a/drivers/net/tulip/eeprom.c
39160+++ b/drivers/net/tulip/eeprom.c
39161@@ -80,7 +80,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
39162 {NULL}};
39163
39164
39165-static const char *block_name[] __devinitdata = {
39166+static const char *block_name[] __devinitconst = {
39167 "21140 non-MII",
39168 "21140 MII PHY",
39169 "21142 Serial PHY",
39170diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
39171index b38d3b7..b1cff23 100644
39172--- a/drivers/net/tulip/winbond-840.c
39173+++ b/drivers/net/tulip/winbond-840.c
39174@@ -235,7 +235,7 @@ struct pci_id_info {
39175 int drv_flags; /* Driver use, intended as capability flags. */
39176 };
39177
39178-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
39179+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
39180 { /* Sometime a Level-One switch card. */
39181 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
39182 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
39183diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
39184index f450bc9..2b747c8 100644
39185--- a/drivers/net/usb/hso.c
39186+++ b/drivers/net/usb/hso.c
39187@@ -71,7 +71,7 @@
39188 #include <asm/byteorder.h>
39189 #include <linux/serial_core.h>
39190 #include <linux/serial.h>
39191-
39192+#include <asm/local.h>
39193
39194 #define DRIVER_VERSION "1.2"
39195 #define MOD_AUTHOR "Option Wireless"
39196@@ -258,7 +258,7 @@ struct hso_serial {
39197
39198 /* from usb_serial_port */
39199 struct tty_struct *tty;
39200- int open_count;
39201+ local_t open_count;
39202 spinlock_t serial_lock;
39203
39204 int (*write_data) (struct hso_serial *serial);
39205@@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
39206 struct urb *urb;
39207
39208 urb = serial->rx_urb[0];
39209- if (serial->open_count > 0) {
39210+ if (local_read(&serial->open_count) > 0) {
39211 count = put_rxbuf_data(urb, serial);
39212 if (count == -1)
39213 return;
39214@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
39215 DUMP1(urb->transfer_buffer, urb->actual_length);
39216
39217 /* Anyone listening? */
39218- if (serial->open_count == 0)
39219+ if (local_read(&serial->open_count) == 0)
39220 return;
39221
39222 if (status == 0) {
39223@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
39224 spin_unlock_irq(&serial->serial_lock);
39225
39226 /* check for port already opened, if not set the termios */
39227- serial->open_count++;
39228- if (serial->open_count == 1) {
39229+ if (local_inc_return(&serial->open_count) == 1) {
39230 tty->low_latency = 1;
39231 serial->rx_state = RX_IDLE;
39232 /* Force default termio settings */
39233@@ -1325,7 +1324,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
39234 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
39235 if (result) {
39236 hso_stop_serial_device(serial->parent);
39237- serial->open_count--;
39238+ local_dec(&serial->open_count);
39239 kref_put(&serial->parent->ref, hso_serial_ref_free);
39240 }
39241 } else {
39242@@ -1362,10 +1361,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
39243
39244 /* reset the rts and dtr */
39245 /* do the actual close */
39246- serial->open_count--;
39247+ local_dec(&serial->open_count);
39248
39249- if (serial->open_count <= 0) {
39250- serial->open_count = 0;
39251+ if (local_read(&serial->open_count) <= 0) {
39252+ local_set(&serial->open_count, 0);
39253 spin_lock_irq(&serial->serial_lock);
39254 if (serial->tty == tty) {
39255 serial->tty->driver_data = NULL;
39256@@ -1447,7 +1446,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
39257
39258 /* the actual setup */
39259 spin_lock_irqsave(&serial->serial_lock, flags);
39260- if (serial->open_count)
39261+ if (local_read(&serial->open_count))
39262 _hso_serial_set_termios(tty, old);
39263 else
39264 tty->termios = old;
39265@@ -3097,7 +3096,7 @@ static int hso_resume(struct usb_interface *iface)
39266 /* Start all serial ports */
39267 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
39268 if (serial_table[i] && (serial_table[i]->interface == iface)) {
39269- if (dev2ser(serial_table[i])->open_count) {
39270+ if (local_read(&dev2ser(serial_table[i])->open_count)) {
39271 result =
39272 hso_start_serial_device(serial_table[i], GFP_NOIO);
39273 hso_kick_transmit(dev2ser(serial_table[i]));
39274diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h
39275index 3e94f0c..ffdd926 100644
39276--- a/drivers/net/vxge/vxge-config.h
39277+++ b/drivers/net/vxge/vxge-config.h
39278@@ -474,7 +474,7 @@ struct vxge_hw_uld_cbs {
39279 void (*link_down)(struct __vxge_hw_device *devh);
39280 void (*crit_err)(struct __vxge_hw_device *devh,
39281 enum vxge_hw_event type, u64 ext_data);
39282-};
39283+} __no_const;
39284
39285 /*
39286 * struct __vxge_hw_blockpool_entry - Block private data structure
39287diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
39288index 068d7a9..35293de 100644
39289--- a/drivers/net/vxge/vxge-main.c
39290+++ b/drivers/net/vxge/vxge-main.c
39291@@ -93,6 +93,8 @@ static inline void VXGE_COMPLETE_VPATH_TX(struct vxge_fifo *fifo)
39292 struct sk_buff *completed[NR_SKB_COMPLETED];
39293 int more;
39294
39295+ pax_track_stack();
39296+
39297 do {
39298 more = 0;
39299 skb_ptr = completed;
39300@@ -1779,6 +1781,8 @@ static enum vxge_hw_status vxge_rth_configure(struct vxgedev *vdev)
39301 u8 mtable[256] = {0}; /* CPU to vpath mapping */
39302 int index;
39303
39304+ pax_track_stack();
39305+
39306 /*
39307 * Filling
39308 * - itable with bucket numbers
39309diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h
39310index 461742b..81be42e 100644
39311--- a/drivers/net/vxge/vxge-traffic.h
39312+++ b/drivers/net/vxge/vxge-traffic.h
39313@@ -2123,7 +2123,7 @@ struct vxge_hw_mempool_cbs {
39314 struct vxge_hw_mempool_dma *dma_object,
39315 u32 index,
39316 u32 is_last);
39317-};
39318+} __no_const;
39319
39320 void
39321 __vxge_hw_mempool_destroy(
39322diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
39323index cd8cb95..4153b79 100644
39324--- a/drivers/net/wan/cycx_x25.c
39325+++ b/drivers/net/wan/cycx_x25.c
39326@@ -1017,6 +1017,8 @@ static void hex_dump(char *msg, unsigned char *p, int len)
39327 unsigned char hex[1024],
39328 * phex = hex;
39329
39330+ pax_track_stack();
39331+
39332 if (len >= (sizeof(hex) / 2))
39333 len = (sizeof(hex) / 2) - 1;
39334
39335diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
39336index aa9248f..a4e3c3b 100644
39337--- a/drivers/net/wan/hdlc_x25.c
39338+++ b/drivers/net/wan/hdlc_x25.c
39339@@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
39340
39341 static int x25_open(struct net_device *dev)
39342 {
39343- struct lapb_register_struct cb;
39344+ static struct lapb_register_struct cb = {
39345+ .connect_confirmation = x25_connected,
39346+ .connect_indication = x25_connected,
39347+ .disconnect_confirmation = x25_disconnected,
39348+ .disconnect_indication = x25_disconnected,
39349+ .data_indication = x25_data_indication,
39350+ .data_transmit = x25_data_transmit
39351+ };
39352 int result;
39353
39354- cb.connect_confirmation = x25_connected;
39355- cb.connect_indication = x25_connected;
39356- cb.disconnect_confirmation = x25_disconnected;
39357- cb.disconnect_indication = x25_disconnected;
39358- cb.data_indication = x25_data_indication;
39359- cb.data_transmit = x25_data_transmit;
39360-
39361 result = lapb_register(dev, &cb);
39362 if (result != LAPB_OK)
39363 return result;
39364diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c
39365index 5ad287c..783b020 100644
39366--- a/drivers/net/wimax/i2400m/usb-fw.c
39367+++ b/drivers/net/wimax/i2400m/usb-fw.c
39368@@ -263,6 +263,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(struct i2400m *i2400m,
39369 int do_autopm = 1;
39370 DECLARE_COMPLETION_ONSTACK(notif_completion);
39371
39372+ pax_track_stack();
39373+
39374 d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n",
39375 i2400m, ack, ack_size);
39376 BUG_ON(_ack == i2400m->bm_ack_buf);
39377diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
39378index 6c26840..62c97c3 100644
39379--- a/drivers/net/wireless/airo.c
39380+++ b/drivers/net/wireless/airo.c
39381@@ -3003,6 +3003,8 @@ static void airo_process_scan_results (struct airo_info *ai) {
39382 BSSListElement * loop_net;
39383 BSSListElement * tmp_net;
39384
39385+ pax_track_stack();
39386+
39387 /* Blow away current list of scan results */
39388 list_for_each_entry_safe (loop_net, tmp_net, &ai->network_list, list) {
39389 list_move_tail (&loop_net->list, &ai->network_free_list);
39390@@ -3783,6 +3785,8 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
39391 WepKeyRid wkr;
39392 int rc;
39393
39394+ pax_track_stack();
39395+
39396 memset( &mySsid, 0, sizeof( mySsid ) );
39397 kfree (ai->flash);
39398 ai->flash = NULL;
39399@@ -4758,6 +4762,8 @@ static int proc_stats_rid_open( struct inode *inode,
39400 __le32 *vals = stats.vals;
39401 int len;
39402
39403+ pax_track_stack();
39404+
39405 if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
39406 return -ENOMEM;
39407 data = (struct proc_data *)file->private_data;
39408@@ -5487,6 +5493,8 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
39409 /* If doLoseSync is not 1, we won't do a Lose Sync */
39410 int doLoseSync = -1;
39411
39412+ pax_track_stack();
39413+
39414 if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
39415 return -ENOMEM;
39416 data = (struct proc_data *)file->private_data;
39417@@ -7193,6 +7201,8 @@ static int airo_get_aplist(struct net_device *dev,
39418 int i;
39419 int loseSync = capable(CAP_NET_ADMIN) ? 1: -1;
39420
39421+ pax_track_stack();
39422+
39423 qual = kmalloc(IW_MAX_AP * sizeof(*qual), GFP_KERNEL);
39424 if (!qual)
39425 return -ENOMEM;
39426@@ -7753,6 +7763,8 @@ static void airo_read_wireless_stats(struct airo_info *local)
39427 CapabilityRid cap_rid;
39428 __le32 *vals = stats_rid.vals;
39429
39430+ pax_track_stack();
39431+
39432 /* Get stats out of the card */
39433 clear_bit(JOB_WSTATS, &local->jobs);
39434 if (local->power.event) {
39435diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
39436index 747508c..82e965d 100644
39437--- a/drivers/net/wireless/ath/ath5k/debug.c
39438+++ b/drivers/net/wireless/ath/ath5k/debug.c
39439@@ -205,6 +205,8 @@ static ssize_t read_file_beacon(struct file *file, char __user *user_buf,
39440 unsigned int v;
39441 u64 tsf;
39442
39443+ pax_track_stack();
39444+
39445 v = ath5k_hw_reg_read(sc->ah, AR5K_BEACON);
39446 len += snprintf(buf+len, sizeof(buf)-len,
39447 "%-24s0x%08x\tintval: %d\tTIM: 0x%x\n",
39448@@ -318,6 +320,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
39449 unsigned int len = 0;
39450 unsigned int i;
39451
39452+ pax_track_stack();
39453+
39454 len += snprintf(buf+len, sizeof(buf)-len,
39455 "DEBUG LEVEL: 0x%08x\n\n", sc->debug.level);
39456
39457diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
39458index 2be4c22..593b1eb 100644
39459--- a/drivers/net/wireless/ath/ath9k/debug.c
39460+++ b/drivers/net/wireless/ath/ath9k/debug.c
39461@@ -220,6 +220,8 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
39462 char buf[512];
39463 unsigned int len = 0;
39464
39465+ pax_track_stack();
39466+
39467 len += snprintf(buf + len, sizeof(buf) - len,
39468 "%8s: %10u\n", "RX", sc->debug.stats.istats.rxok);
39469 len += snprintf(buf + len, sizeof(buf) - len,
39470@@ -360,6 +362,8 @@ static ssize_t read_file_wiphy(struct file *file, char __user *user_buf,
39471 int i;
39472 u8 addr[ETH_ALEN];
39473
39474+ pax_track_stack();
39475+
39476 len += snprintf(buf + len, sizeof(buf) - len,
39477 "primary: %s (%s chan=%d ht=%d)\n",
39478 wiphy_name(sc->pri_wiphy->hw->wiphy),
39479diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
39480index 80b19a4..dab3a45 100644
39481--- a/drivers/net/wireless/b43/debugfs.c
39482+++ b/drivers/net/wireless/b43/debugfs.c
39483@@ -43,7 +43,7 @@ static struct dentry *rootdir;
39484 struct b43_debugfs_fops {
39485 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
39486 int (*write)(struct b43_wldev *dev, const char *buf, size_t count);
39487- struct file_operations fops;
39488+ const struct file_operations fops;
39489 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
39490 size_t file_struct_offset;
39491 };
39492diff --git a/drivers/net/wireless/b43legacy/debugfs.c b/drivers/net/wireless/b43legacy/debugfs.c
39493index 1f85ac5..c99b4b4 100644
39494--- a/drivers/net/wireless/b43legacy/debugfs.c
39495+++ b/drivers/net/wireless/b43legacy/debugfs.c
39496@@ -44,7 +44,7 @@ static struct dentry *rootdir;
39497 struct b43legacy_debugfs_fops {
39498 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
39499 int (*write)(struct b43legacy_wldev *dev, const char *buf, size_t count);
39500- struct file_operations fops;
39501+ const struct file_operations fops;
39502 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
39503 size_t file_struct_offset;
39504 /* Take wl->irq_lock before calling read/write? */
39505diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
39506index 43102bf..3b569c3 100644
39507--- a/drivers/net/wireless/ipw2x00/ipw2100.c
39508+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
39509@@ -2014,6 +2014,8 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
39510 int err;
39511 DECLARE_SSID_BUF(ssid);
39512
39513+ pax_track_stack();
39514+
39515 IPW_DEBUG_HC("SSID: '%s'\n", print_ssid(ssid, essid, ssid_len));
39516
39517 if (ssid_len)
39518@@ -5380,6 +5382,8 @@ static int ipw2100_set_key(struct ipw2100_priv *priv,
39519 struct ipw2100_wep_key *wep_key = (void *)cmd.host_command_parameters;
39520 int err;
39521
39522+ pax_track_stack();
39523+
39524 IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
39525 idx, keylen, len);
39526
39527diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c
39528index 282b1f7..169f0cf 100644
39529--- a/drivers/net/wireless/ipw2x00/libipw_rx.c
39530+++ b/drivers/net/wireless/ipw2x00/libipw_rx.c
39531@@ -1566,6 +1566,8 @@ static void libipw_process_probe_response(struct libipw_device
39532 unsigned long flags;
39533 DECLARE_SSID_BUF(ssid);
39534
39535+ pax_track_stack();
39536+
39537 LIBIPW_DEBUG_SCAN("'%s' (%pM"
39538 "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
39539 print_ssid(ssid, info_element->data, info_element->len),
39540diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
39541index 950267a..80d5fd2 100644
39542--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
39543+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
39544@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = {
39545 },
39546 };
39547
39548-static struct iwl_ops iwl1000_ops = {
39549+static const struct iwl_ops iwl1000_ops = {
39550 .ucode = &iwl5000_ucode,
39551 .lib = &iwl1000_lib,
39552 .hcmd = &iwl5000_hcmd,
39553diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
39554index 56bfcc3..b348020 100644
39555--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
39556+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
39557@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {
39558 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
39559 };
39560
39561-static struct iwl_ops iwl3945_ops = {
39562+static const struct iwl_ops iwl3945_ops = {
39563 .ucode = &iwl3945_ucode,
39564 .lib = &iwl3945_lib,
39565 .hcmd = &iwl3945_hcmd,
39566diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
39567index 585b8d4..e142963 100644
39568--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
39569+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
39570@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = {
39571 },
39572 };
39573
39574-static struct iwl_ops iwl4965_ops = {
39575+static const struct iwl_ops iwl4965_ops = {
39576 .ucode = &iwl4965_ucode,
39577 .lib = &iwl4965_lib,
39578 .hcmd = &iwl4965_hcmd,
39579diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
39580index 1f423f2..e37c192 100644
39581--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
39582+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
39583@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = {
39584 },
39585 };
39586
39587-struct iwl_ops iwl5000_ops = {
39588+const struct iwl_ops iwl5000_ops = {
39589 .ucode = &iwl5000_ucode,
39590 .lib = &iwl5000_lib,
39591 .hcmd = &iwl5000_hcmd,
39592 .utils = &iwl5000_hcmd_utils,
39593 };
39594
39595-static struct iwl_ops iwl5150_ops = {
39596+static const struct iwl_ops iwl5150_ops = {
39597 .ucode = &iwl5000_ucode,
39598 .lib = &iwl5150_lib,
39599 .hcmd = &iwl5000_hcmd,
39600diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
39601index 1473452..f07d5e1 100644
39602--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
39603+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
39604@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000_hcmd_utils = {
39605 .calc_rssi = iwl5000_calc_rssi,
39606 };
39607
39608-static struct iwl_ops iwl6000_ops = {
39609+static const struct iwl_ops iwl6000_ops = {
39610 .ucode = &iwl5000_ucode,
39611 .lib = &iwl6000_lib,
39612 .hcmd = &iwl5000_hcmd,
39613diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
39614index 1a3dfa2..b3e0a61 100644
39615--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
39616+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
39617@@ -857,6 +857,8 @@ static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,
39618 u8 active_index = 0;
39619 s32 tpt = 0;
39620
39621+ pax_track_stack();
39622+
39623 IWL_DEBUG_RATE_LIMIT(priv, "get frame ack response, update rate scale window\n");
39624
39625 if (!ieee80211_is_data(hdr->frame_control) ||
39626@@ -2722,6 +2724,8 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
39627 u8 valid_tx_ant = 0;
39628 struct iwl_link_quality_cmd *lq_cmd = &lq_sta->lq;
39629
39630+ pax_track_stack();
39631+
39632 /* Override starting rate (index 0) if needed for debug purposes */
39633 rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
39634
39635diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
39636index 0e56d78..6a3c107 100644
39637--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
39638+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
39639@@ -2911,7 +2911,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
39640 if (iwl_debug_level & IWL_DL_INFO)
39641 dev_printk(KERN_DEBUG, &(pdev->dev),
39642 "Disabling hw_scan\n");
39643- iwl_hw_ops.hw_scan = NULL;
39644+ pax_open_kernel();
39645+ *(void **)&iwl_hw_ops.hw_scan = NULL;
39646+ pax_close_kernel();
39647 }
39648
39649 hw = iwl_alloc_all(cfg, &iwl_hw_ops);
39650diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
39651index cbc6290..eb323d7 100644
39652--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
39653+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
39654@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_priv *priv);
39655 #endif
39656
39657 #else
39658-#define IWL_DEBUG(__priv, level, fmt, args...)
39659-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)
39660+#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0)
39661+#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0)
39662 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
39663 void *p, u32 len)
39664 {}
39665diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
39666index a198bcf..8e68233 100644
39667--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
39668+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
39669@@ -524,6 +524,8 @@ static ssize_t iwl_dbgfs_status_read(struct file *file,
39670 int pos = 0;
39671 const size_t bufsz = sizeof(buf);
39672
39673+ pax_track_stack();
39674+
39675 pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n",
39676 test_bit(STATUS_HCMD_ACTIVE, &priv->status));
39677 pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_SYNC_ACTIVE: %d\n",
39678@@ -658,6 +660,8 @@ static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf,
39679 const size_t bufsz = sizeof(buf);
39680 ssize_t ret;
39681
39682+ pax_track_stack();
39683+
39684 for (i = 0; i < AC_NUM; i++) {
39685 pos += scnprintf(buf + pos, bufsz - pos,
39686 "\tcw_min\tcw_max\taifsn\ttxop\n");
39687diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
39688index 3539ea4..b174bfa 100644
39689--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
39690+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
39691@@ -68,7 +68,7 @@ struct iwl_tx_queue;
39692
39693 /* shared structures from iwl-5000.c */
39694 extern struct iwl_mod_params iwl50_mod_params;
39695-extern struct iwl_ops iwl5000_ops;
39696+extern const struct iwl_ops iwl5000_ops;
39697 extern struct iwl_ucode_ops iwl5000_ucode;
39698 extern struct iwl_lib_ops iwl5000_lib;
39699 extern struct iwl_hcmd_ops iwl5000_hcmd;
39700diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
39701index 619590d..69235ee 100644
39702--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
39703+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
39704@@ -3927,7 +3927,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
39705 */
39706 if (iwl3945_mod_params.disable_hw_scan) {
39707 IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
39708- iwl3945_hw_ops.hw_scan = NULL;
39709+ pax_open_kernel();
39710+ *(void **)&iwl3945_hw_ops.hw_scan = NULL;
39711+ pax_close_kernel();
39712 }
39713
39714
39715diff --git a/drivers/net/wireless/iwmc3200wifi/debugfs.c b/drivers/net/wireless/iwmc3200wifi/debugfs.c
39716index 1465379..fe4d78b 100644
39717--- a/drivers/net/wireless/iwmc3200wifi/debugfs.c
39718+++ b/drivers/net/wireless/iwmc3200wifi/debugfs.c
39719@@ -299,6 +299,8 @@ static ssize_t iwm_debugfs_fw_err_read(struct file *filp,
39720 int buf_len = 512;
39721 size_t len = 0;
39722
39723+ pax_track_stack();
39724+
39725 if (*ppos != 0)
39726 return 0;
39727 if (count < sizeof(buf))
39728diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
39729index 893a55c..7f66a50 100644
39730--- a/drivers/net/wireless/libertas/debugfs.c
39731+++ b/drivers/net/wireless/libertas/debugfs.c
39732@@ -708,7 +708,7 @@ out_unlock:
39733 struct lbs_debugfs_files {
39734 const char *name;
39735 int perm;
39736- struct file_operations fops;
39737+ const struct file_operations fops;
39738 };
39739
39740 static const struct lbs_debugfs_files debugfs_files[] = {
39741diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
39742index 2ecbedb..42704f0 100644
39743--- a/drivers/net/wireless/rndis_wlan.c
39744+++ b/drivers/net/wireless/rndis_wlan.c
39745@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
39746
39747 devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
39748
39749- if (rts_threshold < 0 || rts_threshold > 2347)
39750+ if (rts_threshold > 2347)
39751 rts_threshold = 2347;
39752
39753 tmp = cpu_to_le32(rts_threshold);
39754diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
39755index 334ccd6..47f8944 100644
39756--- a/drivers/oprofile/buffer_sync.c
39757+++ b/drivers/oprofile/buffer_sync.c
39758@@ -342,7 +342,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
39759 if (cookie == NO_COOKIE)
39760 offset = pc;
39761 if (cookie == INVALID_COOKIE) {
39762- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
39763+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
39764 offset = pc;
39765 }
39766 if (cookie != last_cookie) {
39767@@ -386,14 +386,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
39768 /* add userspace sample */
39769
39770 if (!mm) {
39771- atomic_inc(&oprofile_stats.sample_lost_no_mm);
39772+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
39773 return 0;
39774 }
39775
39776 cookie = lookup_dcookie(mm, s->eip, &offset);
39777
39778 if (cookie == INVALID_COOKIE) {
39779- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
39780+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
39781 return 0;
39782 }
39783
39784@@ -562,7 +562,7 @@ void sync_buffer(int cpu)
39785 /* ignore backtraces if failed to add a sample */
39786 if (state == sb_bt_start) {
39787 state = sb_bt_ignore;
39788- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
39789+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
39790 }
39791 }
39792 release_mm(mm);
39793diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
39794index 5df60a6..72f5c1c 100644
39795--- a/drivers/oprofile/event_buffer.c
39796+++ b/drivers/oprofile/event_buffer.c
39797@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
39798 }
39799
39800 if (buffer_pos == buffer_size) {
39801- atomic_inc(&oprofile_stats.event_lost_overflow);
39802+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
39803 return;
39804 }
39805
39806diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
39807index dc8a042..fe5f315 100644
39808--- a/drivers/oprofile/oprof.c
39809+++ b/drivers/oprofile/oprof.c
39810@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
39811 if (oprofile_ops.switch_events())
39812 return;
39813
39814- atomic_inc(&oprofile_stats.multiplex_counter);
39815+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
39816 start_switch_worker();
39817 }
39818
39819diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
39820index 61689e8..387f7f8 100644
39821--- a/drivers/oprofile/oprofile_stats.c
39822+++ b/drivers/oprofile/oprofile_stats.c
39823@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
39824 cpu_buf->sample_invalid_eip = 0;
39825 }
39826
39827- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
39828- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
39829- atomic_set(&oprofile_stats.event_lost_overflow, 0);
39830- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
39831- atomic_set(&oprofile_stats.multiplex_counter, 0);
39832+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
39833+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
39834+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
39835+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
39836+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
39837 }
39838
39839
39840diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
39841index 0b54e46..a37c527 100644
39842--- a/drivers/oprofile/oprofile_stats.h
39843+++ b/drivers/oprofile/oprofile_stats.h
39844@@ -13,11 +13,11 @@
39845 #include <asm/atomic.h>
39846
39847 struct oprofile_stat_struct {
39848- atomic_t sample_lost_no_mm;
39849- atomic_t sample_lost_no_mapping;
39850- atomic_t bt_lost_no_mapping;
39851- atomic_t event_lost_overflow;
39852- atomic_t multiplex_counter;
39853+ atomic_unchecked_t sample_lost_no_mm;
39854+ atomic_unchecked_t sample_lost_no_mapping;
39855+ atomic_unchecked_t bt_lost_no_mapping;
39856+ atomic_unchecked_t event_lost_overflow;
39857+ atomic_unchecked_t multiplex_counter;
39858 };
39859
39860 extern struct oprofile_stat_struct oprofile_stats;
39861diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
39862index 2766a6d..80c77e2 100644
39863--- a/drivers/oprofile/oprofilefs.c
39864+++ b/drivers/oprofile/oprofilefs.c
39865@@ -187,7 +187,7 @@ static const struct file_operations atomic_ro_fops = {
39866
39867
39868 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
39869- char const *name, atomic_t *val)
39870+ char const *name, atomic_unchecked_t *val)
39871 {
39872 struct dentry *d = __oprofilefs_create_file(sb, root, name,
39873 &atomic_ro_fops, 0444);
39874diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
39875index 13a64bc..ad62835 100644
39876--- a/drivers/parisc/pdc_stable.c
39877+++ b/drivers/parisc/pdc_stable.c
39878@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj, struct attribute *attr,
39879 return ret;
39880 }
39881
39882-static struct sysfs_ops pdcspath_attr_ops = {
39883+static const struct sysfs_ops pdcspath_attr_ops = {
39884 .show = pdcspath_attr_show,
39885 .store = pdcspath_attr_store,
39886 };
39887diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
39888index 8eefe56..40751a7 100644
39889--- a/drivers/parport/procfs.c
39890+++ b/drivers/parport/procfs.c
39891@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
39892
39893 *ppos += len;
39894
39895- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
39896+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
39897 }
39898
39899 #ifdef CONFIG_PARPORT_1284
39900@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
39901
39902 *ppos += len;
39903
39904- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
39905+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
39906 }
39907 #endif /* IEEE1284.3 support. */
39908
39909diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
39910index 73e7d8e..c80f3d2 100644
39911--- a/drivers/pci/hotplug/acpiphp_glue.c
39912+++ b/drivers/pci/hotplug/acpiphp_glue.c
39913@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val,
39914 }
39915
39916
39917-static struct acpi_dock_ops acpiphp_dock_ops = {
39918+static const struct acpi_dock_ops acpiphp_dock_ops = {
39919 .handler = handle_hotplug_event_func,
39920 };
39921
39922diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
39923index 9fff878..ad0ad53 100644
39924--- a/drivers/pci/hotplug/cpci_hotplug.h
39925+++ b/drivers/pci/hotplug/cpci_hotplug.h
39926@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
39927 int (*hardware_test) (struct slot* slot, u32 value);
39928 u8 (*get_power) (struct slot* slot);
39929 int (*set_power) (struct slot* slot, int value);
39930-};
39931+} __no_const;
39932
39933 struct cpci_hp_controller {
39934 unsigned int irq;
39935diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
39936index 76ba8a1..20ca857 100644
39937--- a/drivers/pci/hotplug/cpqphp_nvram.c
39938+++ b/drivers/pci/hotplug/cpqphp_nvram.c
39939@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
39940
39941 void compaq_nvram_init (void __iomem *rom_start)
39942 {
39943+
39944+#ifndef CONFIG_PAX_KERNEXEC
39945 if (rom_start) {
39946 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
39947 }
39948+#endif
39949+
39950 dbg("int15 entry = %p\n", compaq_int15_entry_point);
39951
39952 /* initialize our int15 lock */
39953diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
39954index 6151389..0a894ef 100644
39955--- a/drivers/pci/hotplug/fakephp.c
39956+++ b/drivers/pci/hotplug/fakephp.c
39957@@ -73,7 +73,7 @@ static void legacy_release(struct kobject *kobj)
39958 }
39959
39960 static struct kobj_type legacy_ktype = {
39961- .sysfs_ops = &(struct sysfs_ops){
39962+ .sysfs_ops = &(const struct sysfs_ops){
39963 .store = legacy_store, .show = legacy_show
39964 },
39965 .release = &legacy_release,
39966diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
39967index 5b680df..fe05b7e 100644
39968--- a/drivers/pci/intel-iommu.c
39969+++ b/drivers/pci/intel-iommu.c
39970@@ -2643,7 +2643,7 @@ error:
39971 return 0;
39972 }
39973
39974-static dma_addr_t intel_map_page(struct device *dev, struct page *page,
39975+dma_addr_t intel_map_page(struct device *dev, struct page *page,
39976 unsigned long offset, size_t size,
39977 enum dma_data_direction dir,
39978 struct dma_attrs *attrs)
39979@@ -2719,7 +2719,7 @@ static void add_unmap(struct dmar_domain *dom, struct iova *iova)
39980 spin_unlock_irqrestore(&async_umap_flush_lock, flags);
39981 }
39982
39983-static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
39984+void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
39985 size_t size, enum dma_data_direction dir,
39986 struct dma_attrs *attrs)
39987 {
39988@@ -2768,7 +2768,7 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
39989 }
39990 }
39991
39992-static void *intel_alloc_coherent(struct device *hwdev, size_t size,
39993+void *intel_alloc_coherent(struct device *hwdev, size_t size,
39994 dma_addr_t *dma_handle, gfp_t flags)
39995 {
39996 void *vaddr;
39997@@ -2800,7 +2800,7 @@ static void *intel_alloc_coherent(struct device *hwdev, size_t size,
39998 return NULL;
39999 }
40000
40001-static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
40002+void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
40003 dma_addr_t dma_handle)
40004 {
40005 int order;
40006@@ -2812,7 +2812,7 @@ static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
40007 free_pages((unsigned long)vaddr, order);
40008 }
40009
40010-static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
40011+void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
40012 int nelems, enum dma_data_direction dir,
40013 struct dma_attrs *attrs)
40014 {
40015@@ -2872,7 +2872,7 @@ static int intel_nontranslate_map_sg(struct device *hddev,
40016 return nelems;
40017 }
40018
40019-static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,
40020+int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,
40021 enum dma_data_direction dir, struct dma_attrs *attrs)
40022 {
40023 int i;
40024@@ -2941,12 +2941,12 @@ static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int ne
40025 return nelems;
40026 }
40027
40028-static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
40029+int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
40030 {
40031 return !dma_addr;
40032 }
40033
40034-struct dma_map_ops intel_dma_ops = {
40035+const struct dma_map_ops intel_dma_ops = {
40036 .alloc_coherent = intel_alloc_coherent,
40037 .free_coherent = intel_free_coherent,
40038 .map_sg = intel_map_sg,
40039diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
40040index 5b7056c..607bc94 100644
40041--- a/drivers/pci/pcie/aspm.c
40042+++ b/drivers/pci/pcie/aspm.c
40043@@ -27,9 +27,9 @@
40044 #define MODULE_PARAM_PREFIX "pcie_aspm."
40045
40046 /* Note: those are not register definitions */
40047-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
40048-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
40049-#define ASPM_STATE_L1 (4) /* L1 state */
40050+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
40051+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
40052+#define ASPM_STATE_L1 (4U) /* L1 state */
40053 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
40054 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
40055
40056diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
40057index 8105e32..ca10419 100644
40058--- a/drivers/pci/probe.c
40059+++ b/drivers/pci/probe.c
40060@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(struct device *dev,
40061 return ret;
40062 }
40063
40064-static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev,
40065+static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev,
40066 struct device_attribute *attr,
40067 char *buf)
40068 {
40069 return pci_bus_show_cpuaffinity(dev, 0, attr, buf);
40070 }
40071
40072-static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev,
40073+static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev,
40074 struct device_attribute *attr,
40075 char *buf)
40076 {
40077diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
40078index a03ad8c..024b0da 100644
40079--- a/drivers/pci/proc.c
40080+++ b/drivers/pci/proc.c
40081@@ -480,7 +480,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
40082 static int __init pci_proc_init(void)
40083 {
40084 struct pci_dev *dev = NULL;
40085+
40086+#ifdef CONFIG_GRKERNSEC_PROC_ADD
40087+#ifdef CONFIG_GRKERNSEC_PROC_USER
40088+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
40089+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
40090+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
40091+#endif
40092+#else
40093 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
40094+#endif
40095 proc_create("devices", 0, proc_bus_pci_dir,
40096 &proc_bus_pci_dev_operations);
40097 proc_initialized = 1;
40098diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
40099index 8c02b6c..5584d8e 100644
40100--- a/drivers/pci/slot.c
40101+++ b/drivers/pci/slot.c
40102@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struct kobject *kobj,
40103 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
40104 }
40105
40106-static struct sysfs_ops pci_slot_sysfs_ops = {
40107+static const struct sysfs_ops pci_slot_sysfs_ops = {
40108 .show = pci_slot_attr_show,
40109 .store = pci_slot_attr_store,
40110 };
40111diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
40112index 30cf71d2..50938f1 100644
40113--- a/drivers/pcmcia/pcmcia_ioctl.c
40114+++ b/drivers/pcmcia/pcmcia_ioctl.c
40115@@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
40116 return -EFAULT;
40117 }
40118 }
40119- buf = kmalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL);
40120+ buf = kzalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL);
40121 if (!buf)
40122 return -ENOMEM;
40123
40124diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
40125index 52183c4..b224c69 100644
40126--- a/drivers/platform/x86/acer-wmi.c
40127+++ b/drivers/platform/x86/acer-wmi.c
40128@@ -918,7 +918,7 @@ static int update_bl_status(struct backlight_device *bd)
40129 return 0;
40130 }
40131
40132-static struct backlight_ops acer_bl_ops = {
40133+static const struct backlight_ops acer_bl_ops = {
40134 .get_brightness = read_brightness,
40135 .update_status = update_bl_status,
40136 };
40137diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
40138index 767cb61..a87380b 100644
40139--- a/drivers/platform/x86/asus-laptop.c
40140+++ b/drivers/platform/x86/asus-laptop.c
40141@@ -250,7 +250,7 @@ static struct backlight_device *asus_backlight_device;
40142 */
40143 static int read_brightness(struct backlight_device *bd);
40144 static int update_bl_status(struct backlight_device *bd);
40145-static struct backlight_ops asusbl_ops = {
40146+static const struct backlight_ops asusbl_ops = {
40147 .get_brightness = read_brightness,
40148 .update_status = update_bl_status,
40149 };
40150diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
40151index d66c07a..a4abaac 100644
40152--- a/drivers/platform/x86/asus_acpi.c
40153+++ b/drivers/platform/x86/asus_acpi.c
40154@@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type)
40155 return 0;
40156 }
40157
40158-static struct backlight_ops asus_backlight_data = {
40159+static const struct backlight_ops asus_backlight_data = {
40160 .get_brightness = read_brightness,
40161 .update_status = set_brightness_status,
40162 };
40163diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
40164index 11003bb..550ff1b 100644
40165--- a/drivers/platform/x86/compal-laptop.c
40166+++ b/drivers/platform/x86/compal-laptop.c
40167@@ -163,7 +163,7 @@ static int bl_update_status(struct backlight_device *b)
40168 return set_lcd_level(b->props.brightness);
40169 }
40170
40171-static struct backlight_ops compalbl_ops = {
40172+static const struct backlight_ops compalbl_ops = {
40173 .get_brightness = bl_get_brightness,
40174 .update_status = bl_update_status,
40175 };
40176diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
40177index 07a74da..9dc99fa 100644
40178--- a/drivers/platform/x86/dell-laptop.c
40179+++ b/drivers/platform/x86/dell-laptop.c
40180@@ -318,7 +318,7 @@ static int dell_get_intensity(struct backlight_device *bd)
40181 return buffer.output[1];
40182 }
40183
40184-static struct backlight_ops dell_ops = {
40185+static const struct backlight_ops dell_ops = {
40186 .get_brightness = dell_get_intensity,
40187 .update_status = dell_send_intensity,
40188 };
40189diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
40190index c533b1c..5c81f22 100644
40191--- a/drivers/platform/x86/eeepc-laptop.c
40192+++ b/drivers/platform/x86/eeepc-laptop.c
40193@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device;
40194 */
40195 static int read_brightness(struct backlight_device *bd);
40196 static int update_bl_status(struct backlight_device *bd);
40197-static struct backlight_ops eeepcbl_ops = {
40198+static const struct backlight_ops eeepcbl_ops = {
40199 .get_brightness = read_brightness,
40200 .update_status = update_bl_status,
40201 };
40202diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
40203index bcd4ba8..a249b35 100644
40204--- a/drivers/platform/x86/fujitsu-laptop.c
40205+++ b/drivers/platform/x86/fujitsu-laptop.c
40206@@ -436,7 +436,7 @@ static int bl_update_status(struct backlight_device *b)
40207 return ret;
40208 }
40209
40210-static struct backlight_ops fujitsubl_ops = {
40211+static const struct backlight_ops fujitsubl_ops = {
40212 .get_brightness = bl_get_brightness,
40213 .update_status = bl_update_status,
40214 };
40215diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
40216index 759763d..1093ba2 100644
40217--- a/drivers/platform/x86/msi-laptop.c
40218+++ b/drivers/platform/x86/msi-laptop.c
40219@@ -161,7 +161,7 @@ static int bl_update_status(struct backlight_device *b)
40220 return set_lcd_level(b->props.brightness);
40221 }
40222
40223-static struct backlight_ops msibl_ops = {
40224+static const struct backlight_ops msibl_ops = {
40225 .get_brightness = bl_get_brightness,
40226 .update_status = bl_update_status,
40227 };
40228diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
40229index fe7cf01..9012d8d 100644
40230--- a/drivers/platform/x86/panasonic-laptop.c
40231+++ b/drivers/platform/x86/panasonic-laptop.c
40232@@ -352,7 +352,7 @@ static int bl_set_status(struct backlight_device *bd)
40233 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
40234 }
40235
40236-static struct backlight_ops pcc_backlight_ops = {
40237+static const struct backlight_ops pcc_backlight_ops = {
40238 .get_brightness = bl_get,
40239 .update_status = bl_set_status,
40240 };
40241diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
40242index a2a742c..b37e25e 100644
40243--- a/drivers/platform/x86/sony-laptop.c
40244+++ b/drivers/platform/x86/sony-laptop.c
40245@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness(struct backlight_device *bd)
40246 }
40247
40248 static struct backlight_device *sony_backlight_device;
40249-static struct backlight_ops sony_backlight_ops = {
40250+static const struct backlight_ops sony_backlight_ops = {
40251 .update_status = sony_backlight_update_status,
40252 .get_brightness = sony_backlight_get_brightness,
40253 };
40254diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
40255index 68271ae..5e8fb10 100644
40256--- a/drivers/platform/x86/thinkpad_acpi.c
40257+++ b/drivers/platform/x86/thinkpad_acpi.c
40258@@ -2139,7 +2139,7 @@ static int hotkey_mask_get(void)
40259 return 0;
40260 }
40261
40262-void static hotkey_mask_warn_incomplete_mask(void)
40263+static void hotkey_mask_warn_incomplete_mask(void)
40264 {
40265 /* log only what the user can fix... */
40266 const u32 wantedmask = hotkey_driver_mask &
40267@@ -6125,7 +6125,7 @@ static void tpacpi_brightness_notify_change(void)
40268 BACKLIGHT_UPDATE_HOTKEY);
40269 }
40270
40271-static struct backlight_ops ibm_backlight_data = {
40272+static const struct backlight_ops ibm_backlight_data = {
40273 .get_brightness = brightness_get,
40274 .update_status = brightness_update_status,
40275 };
40276diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
40277index 51c0a8b..0786629 100644
40278--- a/drivers/platform/x86/toshiba_acpi.c
40279+++ b/drivers/platform/x86/toshiba_acpi.c
40280@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
40281 return AE_OK;
40282 }
40283
40284-static struct backlight_ops toshiba_backlight_data = {
40285+static const struct backlight_ops toshiba_backlight_data = {
40286 .get_brightness = get_lcd,
40287 .update_status = set_lcd_status,
40288 };
40289diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
40290index fc83783c..cf370d7 100644
40291--- a/drivers/pnp/pnpbios/bioscalls.c
40292+++ b/drivers/pnp/pnpbios/bioscalls.c
40293@@ -60,7 +60,7 @@ do { \
40294 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
40295 } while(0)
40296
40297-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
40298+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
40299 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
40300
40301 /*
40302@@ -97,7 +97,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
40303
40304 cpu = get_cpu();
40305 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
40306+
40307+ pax_open_kernel();
40308 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
40309+ pax_close_kernel();
40310
40311 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
40312 spin_lock_irqsave(&pnp_bios_lock, flags);
40313@@ -135,7 +138,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
40314 :"memory");
40315 spin_unlock_irqrestore(&pnp_bios_lock, flags);
40316
40317+ pax_open_kernel();
40318 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
40319+ pax_close_kernel();
40320+
40321 put_cpu();
40322
40323 /* If we get here and this is set then the PnP BIOS faulted on us. */
40324@@ -469,7 +475,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
40325 return status;
40326 }
40327
40328-void pnpbios_calls_init(union pnp_bios_install_struct *header)
40329+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
40330 {
40331 int i;
40332
40333@@ -477,6 +483,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
40334 pnp_bios_callpoint.offset = header->fields.pm16offset;
40335 pnp_bios_callpoint.segment = PNP_CS16;
40336
40337+ pax_open_kernel();
40338+
40339 for_each_possible_cpu(i) {
40340 struct desc_struct *gdt = get_cpu_gdt_table(i);
40341 if (!gdt)
40342@@ -488,4 +496,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
40343 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
40344 (unsigned long)__va(header->fields.pm16dseg));
40345 }
40346+
40347+ pax_close_kernel();
40348 }
40349diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
40350index ba97654..66b99d4 100644
40351--- a/drivers/pnp/resource.c
40352+++ b/drivers/pnp/resource.c
40353@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
40354 return 1;
40355
40356 /* check if the resource is valid */
40357- if (*irq < 0 || *irq > 15)
40358+ if (*irq > 15)
40359 return 0;
40360
40361 /* check if the resource is reserved */
40362@@ -419,7 +419,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
40363 return 1;
40364
40365 /* check if the resource is valid */
40366- if (*dma < 0 || *dma == 4 || *dma > 7)
40367+ if (*dma == 4 || *dma > 7)
40368 return 0;
40369
40370 /* check if the resource is reserved */
40371diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
40372index 62bb981..24a2dc9 100644
40373--- a/drivers/power/bq27x00_battery.c
40374+++ b/drivers/power/bq27x00_battery.c
40375@@ -44,7 +44,7 @@ struct bq27x00_device_info;
40376 struct bq27x00_access_methods {
40377 int (*read)(u8 reg, int *rt_value, int b_single,
40378 struct bq27x00_device_info *di);
40379-};
40380+} __no_const;
40381
40382 struct bq27x00_device_info {
40383 struct device *dev;
40384diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
40385index 62227cd..b5b538b 100644
40386--- a/drivers/rtc/rtc-dev.c
40387+++ b/drivers/rtc/rtc-dev.c
40388@@ -14,6 +14,7 @@
40389 #include <linux/module.h>
40390 #include <linux/rtc.h>
40391 #include <linux/sched.h>
40392+#include <linux/grsecurity.h>
40393 #include "rtc-core.h"
40394
40395 static dev_t rtc_devt;
40396@@ -357,6 +358,8 @@ static long rtc_dev_ioctl(struct file *file,
40397 if (copy_from_user(&tm, uarg, sizeof(tm)))
40398 return -EFAULT;
40399
40400+ gr_log_timechange();
40401+
40402 return rtc_set_time(rtc, &tm);
40403
40404 case RTC_PIE_ON:
40405diff --git a/drivers/s390/cio/qdio_perf.c b/drivers/s390/cio/qdio_perf.c
40406index 968e3c7..fbc637a 100644
40407--- a/drivers/s390/cio/qdio_perf.c
40408+++ b/drivers/s390/cio/qdio_perf.c
40409@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_pde;
40410 static int qdio_perf_proc_show(struct seq_file *m, void *v)
40411 {
40412 seq_printf(m, "Number of qdio interrupts\t\t\t: %li\n",
40413- (long)atomic_long_read(&perf_stats.qdio_int));
40414+ (long)atomic_long_read_unchecked(&perf_stats.qdio_int));
40415 seq_printf(m, "Number of PCI interrupts\t\t\t: %li\n",
40416- (long)atomic_long_read(&perf_stats.pci_int));
40417+ (long)atomic_long_read_unchecked(&perf_stats.pci_int));
40418 seq_printf(m, "Number of adapter interrupts\t\t\t: %li\n",
40419- (long)atomic_long_read(&perf_stats.thin_int));
40420+ (long)atomic_long_read_unchecked(&perf_stats.thin_int));
40421 seq_printf(m, "\n");
40422 seq_printf(m, "Inbound tasklet runs\t\t\t\t: %li\n",
40423- (long)atomic_long_read(&perf_stats.tasklet_inbound));
40424+ (long)atomic_long_read_unchecked(&perf_stats.tasklet_inbound));
40425 seq_printf(m, "Outbound tasklet runs\t\t\t\t: %li\n",
40426- (long)atomic_long_read(&perf_stats.tasklet_outbound));
40427+ (long)atomic_long_read_unchecked(&perf_stats.tasklet_outbound));
40428 seq_printf(m, "Adapter interrupt tasklet runs/loops\t\t: %li/%li\n",
40429- (long)atomic_long_read(&perf_stats.tasklet_thinint),
40430- (long)atomic_long_read(&perf_stats.tasklet_thinint_loop));
40431+ (long)atomic_long_read_unchecked(&perf_stats.tasklet_thinint),
40432+ (long)atomic_long_read_unchecked(&perf_stats.tasklet_thinint_loop));
40433 seq_printf(m, "Adapter interrupt inbound tasklet runs/loops\t: %li/%li\n",
40434- (long)atomic_long_read(&perf_stats.thinint_inbound),
40435- (long)atomic_long_read(&perf_stats.thinint_inbound_loop));
40436+ (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound),
40437+ (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound_loop));
40438 seq_printf(m, "\n");
40439 seq_printf(m, "Number of SIGA In issued\t\t\t: %li\n",
40440- (long)atomic_long_read(&perf_stats.siga_in));
40441+ (long)atomic_long_read_unchecked(&perf_stats.siga_in));
40442 seq_printf(m, "Number of SIGA Out issued\t\t\t: %li\n",
40443- (long)atomic_long_read(&perf_stats.siga_out));
40444+ (long)atomic_long_read_unchecked(&perf_stats.siga_out));
40445 seq_printf(m, "Number of SIGA Sync issued\t\t\t: %li\n",
40446- (long)atomic_long_read(&perf_stats.siga_sync));
40447+ (long)atomic_long_read_unchecked(&perf_stats.siga_sync));
40448 seq_printf(m, "\n");
40449 seq_printf(m, "Number of inbound transfers\t\t\t: %li\n",
40450- (long)atomic_long_read(&perf_stats.inbound_handler));
40451+ (long)atomic_long_read_unchecked(&perf_stats.inbound_handler));
40452 seq_printf(m, "Number of outbound transfers\t\t\t: %li\n",
40453- (long)atomic_long_read(&perf_stats.outbound_handler));
40454+ (long)atomic_long_read_unchecked(&perf_stats.outbound_handler));
40455 seq_printf(m, "\n");
40456 seq_printf(m, "Number of fast requeues (outg. SBAL w/o SIGA)\t: %li\n",
40457- (long)atomic_long_read(&perf_stats.fast_requeue));
40458+ (long)atomic_long_read_unchecked(&perf_stats.fast_requeue));
40459 seq_printf(m, "Number of outbound target full condition\t: %li\n",
40460- (long)atomic_long_read(&perf_stats.outbound_target_full));
40461+ (long)atomic_long_read_unchecked(&perf_stats.outbound_target_full));
40462 seq_printf(m, "Number of outbound tasklet mod_timer calls\t: %li\n",
40463- (long)atomic_long_read(&perf_stats.debug_tl_out_timer));
40464+ (long)atomic_long_read_unchecked(&perf_stats.debug_tl_out_timer));
40465 seq_printf(m, "Number of stop polling calls\t\t\t: %li\n",
40466- (long)atomic_long_read(&perf_stats.debug_stop_polling));
40467+ (long)atomic_long_read_unchecked(&perf_stats.debug_stop_polling));
40468 seq_printf(m, "AI inbound tasklet loops after stop polling\t: %li\n",
40469- (long)atomic_long_read(&perf_stats.thinint_inbound_loop2));
40470+ (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound_loop2));
40471 seq_printf(m, "QEBSM EQBS total/incomplete\t\t\t: %li/%li\n",
40472- (long)atomic_long_read(&perf_stats.debug_eqbs_all),
40473- (long)atomic_long_read(&perf_stats.debug_eqbs_incomplete));
40474+ (long)atomic_long_read_unchecked(&perf_stats.debug_eqbs_all),
40475+ (long)atomic_long_read_unchecked(&perf_stats.debug_eqbs_incomplete));
40476 seq_printf(m, "QEBSM SQBS total/incomplete\t\t\t: %li/%li\n",
40477- (long)atomic_long_read(&perf_stats.debug_sqbs_all),
40478- (long)atomic_long_read(&perf_stats.debug_sqbs_incomplete));
40479+ (long)atomic_long_read_unchecked(&perf_stats.debug_sqbs_all),
40480+ (long)atomic_long_read_unchecked(&perf_stats.debug_sqbs_incomplete));
40481 seq_printf(m, "\n");
40482 return 0;
40483 }
40484diff --git a/drivers/s390/cio/qdio_perf.h b/drivers/s390/cio/qdio_perf.h
40485index ff4504c..b3604c3 100644
40486--- a/drivers/s390/cio/qdio_perf.h
40487+++ b/drivers/s390/cio/qdio_perf.h
40488@@ -13,46 +13,46 @@
40489
40490 struct qdio_perf_stats {
40491 /* interrupt handler calls */
40492- atomic_long_t qdio_int;
40493- atomic_long_t pci_int;
40494- atomic_long_t thin_int;
40495+ atomic_long_unchecked_t qdio_int;
40496+ atomic_long_unchecked_t pci_int;
40497+ atomic_long_unchecked_t thin_int;
40498
40499 /* tasklet runs */
40500- atomic_long_t tasklet_inbound;
40501- atomic_long_t tasklet_outbound;
40502- atomic_long_t tasklet_thinint;
40503- atomic_long_t tasklet_thinint_loop;
40504- atomic_long_t thinint_inbound;
40505- atomic_long_t thinint_inbound_loop;
40506- atomic_long_t thinint_inbound_loop2;
40507+ atomic_long_unchecked_t tasklet_inbound;
40508+ atomic_long_unchecked_t tasklet_outbound;
40509+ atomic_long_unchecked_t tasklet_thinint;
40510+ atomic_long_unchecked_t tasklet_thinint_loop;
40511+ atomic_long_unchecked_t thinint_inbound;
40512+ atomic_long_unchecked_t thinint_inbound_loop;
40513+ atomic_long_unchecked_t thinint_inbound_loop2;
40514
40515 /* signal adapter calls */
40516- atomic_long_t siga_out;
40517- atomic_long_t siga_in;
40518- atomic_long_t siga_sync;
40519+ atomic_long_unchecked_t siga_out;
40520+ atomic_long_unchecked_t siga_in;
40521+ atomic_long_unchecked_t siga_sync;
40522
40523 /* misc */
40524- atomic_long_t inbound_handler;
40525- atomic_long_t outbound_handler;
40526- atomic_long_t fast_requeue;
40527- atomic_long_t outbound_target_full;
40528+ atomic_long_unchecked_t inbound_handler;
40529+ atomic_long_unchecked_t outbound_handler;
40530+ atomic_long_unchecked_t fast_requeue;
40531+ atomic_long_unchecked_t outbound_target_full;
40532
40533 /* for debugging */
40534- atomic_long_t debug_tl_out_timer;
40535- atomic_long_t debug_stop_polling;
40536- atomic_long_t debug_eqbs_all;
40537- atomic_long_t debug_eqbs_incomplete;
40538- atomic_long_t debug_sqbs_all;
40539- atomic_long_t debug_sqbs_incomplete;
40540+ atomic_long_unchecked_t debug_tl_out_timer;
40541+ atomic_long_unchecked_t debug_stop_polling;
40542+ atomic_long_unchecked_t debug_eqbs_all;
40543+ atomic_long_unchecked_t debug_eqbs_incomplete;
40544+ atomic_long_unchecked_t debug_sqbs_all;
40545+ atomic_long_unchecked_t debug_sqbs_incomplete;
40546 };
40547
40548 extern struct qdio_perf_stats perf_stats;
40549 extern int qdio_performance_stats;
40550
40551-static inline void qdio_perf_stat_inc(atomic_long_t *count)
40552+static inline void qdio_perf_stat_inc(atomic_long_unchecked_t *count)
40553 {
40554 if (qdio_performance_stats)
40555- atomic_long_inc(count);
40556+ atomic_long_inc_unchecked(count);
40557 }
40558
40559 int qdio_setup_perf_stats(void);
40560diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
40561index 1ddcf40..a85f062 100644
40562--- a/drivers/scsi/BusLogic.c
40563+++ b/drivers/scsi/BusLogic.c
40564@@ -961,6 +961,8 @@ static int __init BusLogic_InitializeFlashPointProbeInfo(struct BusLogic_HostAda
40565 static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
40566 *PrototypeHostAdapter)
40567 {
40568+ pax_track_stack();
40569+
40570 /*
40571 If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
40572 Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
40573diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
40574index cdbdec9..b7d560b 100644
40575--- a/drivers/scsi/aacraid/aacraid.h
40576+++ b/drivers/scsi/aacraid/aacraid.h
40577@@ -471,7 +471,7 @@ struct adapter_ops
40578 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
40579 /* Administrative operations */
40580 int (*adapter_comm)(struct aac_dev * dev, int comm);
40581-};
40582+} __no_const;
40583
40584 /*
40585 * Define which interrupt handler needs to be installed
40586diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
40587index a5b8e7b..a6a0e43 100644
40588--- a/drivers/scsi/aacraid/commctrl.c
40589+++ b/drivers/scsi/aacraid/commctrl.c
40590@@ -481,6 +481,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
40591 u32 actual_fibsize64, actual_fibsize = 0;
40592 int i;
40593
40594+ pax_track_stack();
40595
40596 if (dev->in_reset) {
40597 dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
40598diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
40599index 9b97c3e..f099725 100644
40600--- a/drivers/scsi/aacraid/linit.c
40601+++ b/drivers/scsi/aacraid/linit.c
40602@@ -91,7 +91,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
40603 #elif defined(__devinitconst)
40604 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
40605 #else
40606-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
40607+static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
40608 #endif
40609 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
40610 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
40611diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
40612index 996f722..9127845 100644
40613--- a/drivers/scsi/aic94xx/aic94xx_init.c
40614+++ b/drivers/scsi/aic94xx/aic94xx_init.c
40615@@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(struct device *dev,
40616 flash_error_table[i].reason);
40617 }
40618
40619-static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUGO,
40620+static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUSR,
40621 asd_show_update_bios, asd_store_update_bios);
40622
40623 static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
40624@@ -1011,7 +1011,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
40625 .lldd_control_phy = asd_control_phy,
40626 };
40627
40628-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
40629+static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
40630 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
40631 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
40632 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
40633diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
40634index 58efd4b..cb48dc7 100644
40635--- a/drivers/scsi/bfa/bfa_ioc.h
40636+++ b/drivers/scsi/bfa/bfa_ioc.h
40637@@ -127,7 +127,7 @@ struct bfa_ioc_cbfn_s {
40638 bfa_ioc_disable_cbfn_t disable_cbfn;
40639 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
40640 bfa_ioc_reset_cbfn_t reset_cbfn;
40641-};
40642+} __no_const;
40643
40644 /**
40645 * Heartbeat failure notification queue element.
40646diff --git a/drivers/scsi/bfa/bfa_iocfc.h b/drivers/scsi/bfa/bfa_iocfc.h
40647index 7ad177e..5503586 100644
40648--- a/drivers/scsi/bfa/bfa_iocfc.h
40649+++ b/drivers/scsi/bfa/bfa_iocfc.h
40650@@ -61,7 +61,7 @@ struct bfa_hwif_s {
40651 void (*hw_isr_mode_set)(struct bfa_s *bfa, bfa_boolean_t msix);
40652 void (*hw_msix_getvecs)(struct bfa_s *bfa, u32 *vecmap,
40653 u32 *nvecs, u32 *maxvec);
40654-};
40655+} __no_const;
40656 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
40657
40658 struct bfa_iocfc_s {
40659diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
40660index 4967643..cbec06b 100644
40661--- a/drivers/scsi/dpt_i2o.c
40662+++ b/drivers/scsi/dpt_i2o.c
40663@@ -1804,6 +1804,8 @@ static int adpt_i2o_passthru(adpt_hba* pHba, u32 __user *arg)
40664 dma_addr_t addr;
40665 ulong flags = 0;
40666
40667+ pax_track_stack();
40668+
40669 memset(&msg, 0, MAX_MESSAGE_SIZE*4);
40670 // get user msg size in u32s
40671 if(get_user(size, &user_msg[0])){
40672@@ -2297,6 +2299,8 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_d
40673 s32 rcode;
40674 dma_addr_t addr;
40675
40676+ pax_track_stack();
40677+
40678 memset(msg, 0 , sizeof(msg));
40679 len = scsi_bufflen(cmd);
40680 direction = 0x00000000;
40681diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
40682index c7076ce..e20c67c 100644
40683--- a/drivers/scsi/eata.c
40684+++ b/drivers/scsi/eata.c
40685@@ -1087,6 +1087,8 @@ static int port_detect(unsigned long port_base, unsigned int j,
40686 struct hostdata *ha;
40687 char name[16];
40688
40689+ pax_track_stack();
40690+
40691 sprintf(name, "%s%d", driver_name, j);
40692
40693 if (!request_region(port_base, REGION_SIZE, driver_name)) {
40694diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
40695index 11ae5c9..891daec 100644
40696--- a/drivers/scsi/fcoe/libfcoe.c
40697+++ b/drivers/scsi/fcoe/libfcoe.c
40698@@ -809,6 +809,8 @@ static void fcoe_ctlr_recv_els(struct fcoe_ctlr *fip, struct sk_buff *skb)
40699 size_t rlen;
40700 size_t dlen;
40701
40702+ pax_track_stack();
40703+
40704 fiph = (struct fip_header *)skb->data;
40705 sub = fiph->fip_subcode;
40706 if (sub != FIP_SC_REQ && sub != FIP_SC_REP)
40707diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
40708index 71c7bbe..e93088a 100644
40709--- a/drivers/scsi/fnic/fnic_main.c
40710+++ b/drivers/scsi/fnic/fnic_main.c
40711@@ -669,7 +669,7 @@ static int __devinit fnic_probe(struct pci_dev *pdev,
40712 /* Start local port initiatialization */
40713
40714 lp->link_up = 0;
40715- lp->tt = fnic_transport_template;
40716+ memcpy((void *)&lp->tt, &fnic_transport_template, sizeof(fnic_transport_template));
40717
40718 lp->max_retry_count = fnic->config.flogi_retries;
40719 lp->max_rport_retry_count = fnic->config.plogi_retries;
40720diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
40721index bb96d74..9ec3ce4 100644
40722--- a/drivers/scsi/gdth.c
40723+++ b/drivers/scsi/gdth.c
40724@@ -4102,6 +4102,8 @@ static int ioc_lockdrv(void __user *arg)
40725 ulong flags;
40726 gdth_ha_str *ha;
40727
40728+ pax_track_stack();
40729+
40730 if (copy_from_user(&ldrv, arg, sizeof(gdth_ioctl_lockdrv)))
40731 return -EFAULT;
40732 ha = gdth_find_ha(ldrv.ionode);
40733@@ -4134,6 +4136,8 @@ static int ioc_resetdrv(void __user *arg, char *cmnd)
40734 gdth_ha_str *ha;
40735 int rval;
40736
40737+ pax_track_stack();
40738+
40739 if (copy_from_user(&res, arg, sizeof(gdth_ioctl_reset)) ||
40740 res.number >= MAX_HDRIVES)
40741 return -EFAULT;
40742@@ -4169,6 +4173,8 @@ static int ioc_general(void __user *arg, char *cmnd)
40743 gdth_ha_str *ha;
40744 int rval;
40745
40746+ pax_track_stack();
40747+
40748 if (copy_from_user(&gen, arg, sizeof(gdth_ioctl_general)))
40749 return -EFAULT;
40750 ha = gdth_find_ha(gen.ionode);
40751@@ -4625,6 +4631,9 @@ static void gdth_flush(gdth_ha_str *ha)
40752 int i;
40753 gdth_cmd_str gdtcmd;
40754 char cmnd[MAX_COMMAND_SIZE];
40755+
40756+ pax_track_stack();
40757+
40758 memset(cmnd, 0xff, MAX_COMMAND_SIZE);
40759
40760 TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
40761diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c
40762index 1258da3..20d8ae6 100644
40763--- a/drivers/scsi/gdth_proc.c
40764+++ b/drivers/scsi/gdth_proc.c
40765@@ -46,6 +46,9 @@ static int gdth_set_asc_info(struct Scsi_Host *host, char *buffer,
40766 ulong64 paddr;
40767
40768 char cmnd[MAX_COMMAND_SIZE];
40769+
40770+ pax_track_stack();
40771+
40772 memset(cmnd, 0xff, 12);
40773 memset(&gdtcmd, 0, sizeof(gdth_cmd_str));
40774
40775@@ -174,6 +177,8 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,
40776 gdth_hget_str *phg;
40777 char cmnd[MAX_COMMAND_SIZE];
40778
40779+ pax_track_stack();
40780+
40781 gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
40782 estr = kmalloc(sizeof(*estr), GFP_KERNEL);
40783 if (!gdtcmd || !estr)
40784diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
40785index d03a926..f324286 100644
40786--- a/drivers/scsi/hosts.c
40787+++ b/drivers/scsi/hosts.c
40788@@ -40,7 +40,7 @@
40789 #include "scsi_logging.h"
40790
40791
40792-static atomic_t scsi_host_next_hn; /* host_no for next new host */
40793+static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
40794
40795
40796 static void scsi_host_cls_release(struct device *dev)
40797@@ -347,7 +347,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
40798 * subtract one because we increment first then return, but we need to
40799 * know what the next host number was before increment
40800 */
40801- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
40802+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
40803 shost->dma_channel = 0xff;
40804
40805 /* These three are default values which can be overridden */
40806diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
40807index a601159..55e19d2 100644
40808--- a/drivers/scsi/ipr.c
40809+++ b/drivers/scsi/ipr.c
40810@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_queued_cmd *qc)
40811 return true;
40812 }
40813
40814-static struct ata_port_operations ipr_sata_ops = {
40815+static const struct ata_port_operations ipr_sata_ops = {
40816 .phy_reset = ipr_ata_phy_reset,
40817 .hardreset = ipr_sata_reset,
40818 .post_internal_cmd = ipr_ata_post_internal,
40819diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
40820index 4e49fbc..97907ff 100644
40821--- a/drivers/scsi/ips.h
40822+++ b/drivers/scsi/ips.h
40823@@ -1027,7 +1027,7 @@ typedef struct {
40824 int (*intr)(struct ips_ha *);
40825 void (*enableint)(struct ips_ha *);
40826 uint32_t (*statupd)(struct ips_ha *);
40827-} ips_hw_func_t;
40828+} __no_const ips_hw_func_t;
40829
40830 typedef struct ips_ha {
40831 uint8_t ha_id[IPS_MAX_CHANNELS+1];
40832diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
40833index c1c1574..a9c9348 100644
40834--- a/drivers/scsi/libfc/fc_exch.c
40835+++ b/drivers/scsi/libfc/fc_exch.c
40836@@ -86,12 +86,12 @@ struct fc_exch_mgr {
40837 * all together if not used XXX
40838 */
40839 struct {
40840- atomic_t no_free_exch;
40841- atomic_t no_free_exch_xid;
40842- atomic_t xid_not_found;
40843- atomic_t xid_busy;
40844- atomic_t seq_not_found;
40845- atomic_t non_bls_resp;
40846+ atomic_unchecked_t no_free_exch;
40847+ atomic_unchecked_t no_free_exch_xid;
40848+ atomic_unchecked_t xid_not_found;
40849+ atomic_unchecked_t xid_busy;
40850+ atomic_unchecked_t seq_not_found;
40851+ atomic_unchecked_t non_bls_resp;
40852 } stats;
40853 };
40854 #define fc_seq_exch(sp) container_of(sp, struct fc_exch, seq)
40855@@ -510,7 +510,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
40856 /* allocate memory for exchange */
40857 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
40858 if (!ep) {
40859- atomic_inc(&mp->stats.no_free_exch);
40860+ atomic_inc_unchecked(&mp->stats.no_free_exch);
40861 goto out;
40862 }
40863 memset(ep, 0, sizeof(*ep));
40864@@ -557,7 +557,7 @@ out:
40865 return ep;
40866 err:
40867 spin_unlock_bh(&pool->lock);
40868- atomic_inc(&mp->stats.no_free_exch_xid);
40869+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
40870 mempool_free(ep, mp->ep_pool);
40871 return NULL;
40872 }
40873@@ -690,7 +690,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
40874 xid = ntohs(fh->fh_ox_id); /* we originated exch */
40875 ep = fc_exch_find(mp, xid);
40876 if (!ep) {
40877- atomic_inc(&mp->stats.xid_not_found);
40878+ atomic_inc_unchecked(&mp->stats.xid_not_found);
40879 reject = FC_RJT_OX_ID;
40880 goto out;
40881 }
40882@@ -720,7 +720,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
40883 ep = fc_exch_find(mp, xid);
40884 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
40885 if (ep) {
40886- atomic_inc(&mp->stats.xid_busy);
40887+ atomic_inc_unchecked(&mp->stats.xid_busy);
40888 reject = FC_RJT_RX_ID;
40889 goto rel;
40890 }
40891@@ -731,7 +731,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
40892 }
40893 xid = ep->xid; /* get our XID */
40894 } else if (!ep) {
40895- atomic_inc(&mp->stats.xid_not_found);
40896+ atomic_inc_unchecked(&mp->stats.xid_not_found);
40897 reject = FC_RJT_RX_ID; /* XID not found */
40898 goto out;
40899 }
40900@@ -752,7 +752,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
40901 } else {
40902 sp = &ep->seq;
40903 if (sp->id != fh->fh_seq_id) {
40904- atomic_inc(&mp->stats.seq_not_found);
40905+ atomic_inc_unchecked(&mp->stats.seq_not_found);
40906 reject = FC_RJT_SEQ_ID; /* sequence/exch should exist */
40907 goto rel;
40908 }
40909@@ -1163,22 +1163,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
40910
40911 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
40912 if (!ep) {
40913- atomic_inc(&mp->stats.xid_not_found);
40914+ atomic_inc_unchecked(&mp->stats.xid_not_found);
40915 goto out;
40916 }
40917 if (ep->esb_stat & ESB_ST_COMPLETE) {
40918- atomic_inc(&mp->stats.xid_not_found);
40919+ atomic_inc_unchecked(&mp->stats.xid_not_found);
40920 goto out;
40921 }
40922 if (ep->rxid == FC_XID_UNKNOWN)
40923 ep->rxid = ntohs(fh->fh_rx_id);
40924 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
40925- atomic_inc(&mp->stats.xid_not_found);
40926+ atomic_inc_unchecked(&mp->stats.xid_not_found);
40927 goto rel;
40928 }
40929 if (ep->did != ntoh24(fh->fh_s_id) &&
40930 ep->did != FC_FID_FLOGI) {
40931- atomic_inc(&mp->stats.xid_not_found);
40932+ atomic_inc_unchecked(&mp->stats.xid_not_found);
40933 goto rel;
40934 }
40935 sof = fr_sof(fp);
40936@@ -1189,7 +1189,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
40937 } else {
40938 sp = &ep->seq;
40939 if (sp->id != fh->fh_seq_id) {
40940- atomic_inc(&mp->stats.seq_not_found);
40941+ atomic_inc_unchecked(&mp->stats.seq_not_found);
40942 goto rel;
40943 }
40944 }
40945@@ -1249,9 +1249,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
40946 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
40947
40948 if (!sp)
40949- atomic_inc(&mp->stats.xid_not_found);
40950+ atomic_inc_unchecked(&mp->stats.xid_not_found);
40951 else
40952- atomic_inc(&mp->stats.non_bls_resp);
40953+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
40954
40955 fc_frame_free(fp);
40956 }
40957diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
40958index 0ee989f..a582241 100644
40959--- a/drivers/scsi/libsas/sas_ata.c
40960+++ b/drivers/scsi/libsas/sas_ata.c
40961@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_link *link, unsigned int sc_reg_in,
40962 }
40963 }
40964
40965-static struct ata_port_operations sas_sata_ops = {
40966+static const struct ata_port_operations sas_sata_ops = {
40967 .phy_reset = sas_ata_phy_reset,
40968 .post_internal_cmd = sas_ata_post_internal,
40969 .qc_defer = ata_std_qc_defer,
40970diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
40971index aa10f79..5cc79e4 100644
40972--- a/drivers/scsi/lpfc/lpfc.h
40973+++ b/drivers/scsi/lpfc/lpfc.h
40974@@ -400,7 +400,7 @@ struct lpfc_vport {
40975 struct dentry *debug_nodelist;
40976 struct dentry *vport_debugfs_root;
40977 struct lpfc_debugfs_trc *disc_trc;
40978- atomic_t disc_trc_cnt;
40979+ atomic_unchecked_t disc_trc_cnt;
40980 #endif
40981 uint8_t stat_data_enabled;
40982 uint8_t stat_data_blocked;
40983@@ -725,8 +725,8 @@ struct lpfc_hba {
40984 struct timer_list fabric_block_timer;
40985 unsigned long bit_flags;
40986 #define FABRIC_COMANDS_BLOCKED 0
40987- atomic_t num_rsrc_err;
40988- atomic_t num_cmd_success;
40989+ atomic_unchecked_t num_rsrc_err;
40990+ atomic_unchecked_t num_cmd_success;
40991 unsigned long last_rsrc_error_time;
40992 unsigned long last_ramp_down_time;
40993 unsigned long last_ramp_up_time;
40994@@ -740,7 +740,7 @@ struct lpfc_hba {
40995 struct dentry *debug_dumpDif; /* BlockGuard BPL*/
40996 struct dentry *debug_slow_ring_trc;
40997 struct lpfc_debugfs_trc *slow_ring_trc;
40998- atomic_t slow_ring_trc_cnt;
40999+ atomic_unchecked_t slow_ring_trc_cnt;
41000 #endif
41001
41002 /* Used for deferred freeing of ELS data buffers */
41003diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
41004index 8d0f0de..7c77a62 100644
41005--- a/drivers/scsi/lpfc/lpfc_debugfs.c
41006+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
41007@@ -124,7 +124,7 @@ struct lpfc_debug {
41008 int len;
41009 };
41010
41011-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
41012+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
41013 static unsigned long lpfc_debugfs_start_time = 0L;
41014
41015 /**
41016@@ -158,7 +158,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
41017 lpfc_debugfs_enable = 0;
41018
41019 len = 0;
41020- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
41021+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
41022 (lpfc_debugfs_max_disc_trc - 1);
41023 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
41024 dtp = vport->disc_trc + i;
41025@@ -219,7 +219,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
41026 lpfc_debugfs_enable = 0;
41027
41028 len = 0;
41029- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
41030+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
41031 (lpfc_debugfs_max_slow_ring_trc - 1);
41032 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
41033 dtp = phba->slow_ring_trc + i;
41034@@ -397,6 +397,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size)
41035 uint32_t *ptr;
41036 char buffer[1024];
41037
41038+ pax_track_stack();
41039+
41040 off = 0;
41041 spin_lock_irq(&phba->hbalock);
41042
41043@@ -634,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
41044 !vport || !vport->disc_trc)
41045 return;
41046
41047- index = atomic_inc_return(&vport->disc_trc_cnt) &
41048+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
41049 (lpfc_debugfs_max_disc_trc - 1);
41050 dtp = vport->disc_trc + index;
41051 dtp->fmt = fmt;
41052 dtp->data1 = data1;
41053 dtp->data2 = data2;
41054 dtp->data3 = data3;
41055- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
41056+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
41057 dtp->jif = jiffies;
41058 #endif
41059 return;
41060@@ -672,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
41061 !phba || !phba->slow_ring_trc)
41062 return;
41063
41064- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
41065+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
41066 (lpfc_debugfs_max_slow_ring_trc - 1);
41067 dtp = phba->slow_ring_trc + index;
41068 dtp->fmt = fmt;
41069 dtp->data1 = data1;
41070 dtp->data2 = data2;
41071 dtp->data3 = data3;
41072- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
41073+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
41074 dtp->jif = jiffies;
41075 #endif
41076 return;
41077@@ -1364,7 +1366,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
41078 "slow_ring buffer\n");
41079 goto debug_failed;
41080 }
41081- atomic_set(&phba->slow_ring_trc_cnt, 0);
41082+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
41083 memset(phba->slow_ring_trc, 0,
41084 (sizeof(struct lpfc_debugfs_trc) *
41085 lpfc_debugfs_max_slow_ring_trc));
41086@@ -1410,7 +1412,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
41087 "buffer\n");
41088 goto debug_failed;
41089 }
41090- atomic_set(&vport->disc_trc_cnt, 0);
41091+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
41092
41093 snprintf(name, sizeof(name), "discovery_trace");
41094 vport->debug_disc_trc =
41095diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
41096index 549bc7d..8189dbb 100644
41097--- a/drivers/scsi/lpfc/lpfc_init.c
41098+++ b/drivers/scsi/lpfc/lpfc_init.c
41099@@ -8021,8 +8021,10 @@ lpfc_init(void)
41100 printk(LPFC_COPYRIGHT "\n");
41101
41102 if (lpfc_enable_npiv) {
41103- lpfc_transport_functions.vport_create = lpfc_vport_create;
41104- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
41105+ pax_open_kernel();
41106+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
41107+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
41108+ pax_close_kernel();
41109 }
41110 lpfc_transport_template =
41111 fc_attach_transport(&lpfc_transport_functions);
41112diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
41113index c88f59f..ff2a42f 100644
41114--- a/drivers/scsi/lpfc/lpfc_scsi.c
41115+++ b/drivers/scsi/lpfc/lpfc_scsi.c
41116@@ -259,7 +259,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
41117 uint32_t evt_posted;
41118
41119 spin_lock_irqsave(&phba->hbalock, flags);
41120- atomic_inc(&phba->num_rsrc_err);
41121+ atomic_inc_unchecked(&phba->num_rsrc_err);
41122 phba->last_rsrc_error_time = jiffies;
41123
41124 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
41125@@ -300,7 +300,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
41126 unsigned long flags;
41127 struct lpfc_hba *phba = vport->phba;
41128 uint32_t evt_posted;
41129- atomic_inc(&phba->num_cmd_success);
41130+ atomic_inc_unchecked(&phba->num_cmd_success);
41131
41132 if (vport->cfg_lun_queue_depth <= queue_depth)
41133 return;
41134@@ -343,8 +343,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
41135 int i;
41136 struct lpfc_rport_data *rdata;
41137
41138- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
41139- num_cmd_success = atomic_read(&phba->num_cmd_success);
41140+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
41141+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
41142
41143 vports = lpfc_create_vport_work_array(phba);
41144 if (vports != NULL)
41145@@ -378,8 +378,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
41146 }
41147 }
41148 lpfc_destroy_vport_work_array(phba, vports);
41149- atomic_set(&phba->num_rsrc_err, 0);
41150- atomic_set(&phba->num_cmd_success, 0);
41151+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
41152+ atomic_set_unchecked(&phba->num_cmd_success, 0);
41153 }
41154
41155 /**
41156@@ -427,8 +427,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
41157 }
41158 }
41159 lpfc_destroy_vport_work_array(phba, vports);
41160- atomic_set(&phba->num_rsrc_err, 0);
41161- atomic_set(&phba->num_cmd_success, 0);
41162+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
41163+ atomic_set_unchecked(&phba->num_cmd_success, 0);
41164 }
41165
41166 /**
41167diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
41168index 234f0b7..3020aea 100644
41169--- a/drivers/scsi/megaraid/megaraid_mbox.c
41170+++ b/drivers/scsi/megaraid/megaraid_mbox.c
41171@@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter)
41172 int rval;
41173 int i;
41174
41175+ pax_track_stack();
41176+
41177 // Allocate memory for the base list of scb for management module.
41178 adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
41179
41180diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
41181index 7a117c1..ee01e9e 100644
41182--- a/drivers/scsi/osd/osd_initiator.c
41183+++ b/drivers/scsi/osd/osd_initiator.c
41184@@ -94,6 +94,8 @@ static int _osd_print_system_info(struct osd_dev *od, void *caps)
41185 int nelem = ARRAY_SIZE(get_attrs), a = 0;
41186 int ret;
41187
41188+ pax_track_stack();
41189+
41190 or = osd_start_request(od, GFP_KERNEL);
41191 if (!or)
41192 return -ENOMEM;
41193diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
41194index 9ab8c86..9425ad3 100644
41195--- a/drivers/scsi/pmcraid.c
41196+++ b/drivers/scsi/pmcraid.c
41197@@ -189,8 +189,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
41198 res->scsi_dev = scsi_dev;
41199 scsi_dev->hostdata = res;
41200 res->change_detected = 0;
41201- atomic_set(&res->read_failures, 0);
41202- atomic_set(&res->write_failures, 0);
41203+ atomic_set_unchecked(&res->read_failures, 0);
41204+ atomic_set_unchecked(&res->write_failures, 0);
41205 rc = 0;
41206 }
41207 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
41208@@ -2396,9 +2396,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
41209
41210 /* If this was a SCSI read/write command keep count of errors */
41211 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
41212- atomic_inc(&res->read_failures);
41213+ atomic_inc_unchecked(&res->read_failures);
41214 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
41215- atomic_inc(&res->write_failures);
41216+ atomic_inc_unchecked(&res->write_failures);
41217
41218 if (!RES_IS_GSCSI(res->cfg_entry) &&
41219 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
41220@@ -4116,7 +4116,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
41221
41222 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
41223 /* add resources only after host is added into system */
41224- if (!atomic_read(&pinstance->expose_resources))
41225+ if (!atomic_read_unchecked(&pinstance->expose_resources))
41226 return;
41227
41228 spin_lock_irqsave(&pinstance->resource_lock, lock_flags);
41229@@ -4850,7 +4850,7 @@ static int __devinit pmcraid_init_instance(
41230 init_waitqueue_head(&pinstance->reset_wait_q);
41231
41232 atomic_set(&pinstance->outstanding_cmds, 0);
41233- atomic_set(&pinstance->expose_resources, 0);
41234+ atomic_set_unchecked(&pinstance->expose_resources, 0);
41235
41236 INIT_LIST_HEAD(&pinstance->free_res_q);
41237 INIT_LIST_HEAD(&pinstance->used_res_q);
41238@@ -5502,7 +5502,7 @@ static int __devinit pmcraid_probe(
41239 /* Schedule worker thread to handle CCN and take care of adding and
41240 * removing devices to OS
41241 */
41242- atomic_set(&pinstance->expose_resources, 1);
41243+ atomic_set_unchecked(&pinstance->expose_resources, 1);
41244 schedule_work(&pinstance->worker_q);
41245 return rc;
41246
41247diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
41248index 3441b3f..6cbe8f7 100644
41249--- a/drivers/scsi/pmcraid.h
41250+++ b/drivers/scsi/pmcraid.h
41251@@ -690,7 +690,7 @@ struct pmcraid_instance {
41252 atomic_t outstanding_cmds;
41253
41254 /* should add/delete resources to mid-layer now ?*/
41255- atomic_t expose_resources;
41256+ atomic_unchecked_t expose_resources;
41257
41258 /* Tasklet to handle deferred processing */
41259 struct tasklet_struct isr_tasklet[PMCRAID_NUM_MSIX_VECTORS];
41260@@ -727,8 +727,8 @@ struct pmcraid_resource_entry {
41261 struct list_head queue; /* link to "to be exposed" resources */
41262 struct pmcraid_config_table_entry cfg_entry;
41263 struct scsi_device *scsi_dev; /* Link scsi_device structure */
41264- atomic_t read_failures; /* count of failed READ commands */
41265- atomic_t write_failures; /* count of failed WRITE commands */
41266+ atomic_unchecked_t read_failures; /* count of failed READ commands */
41267+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
41268
41269 /* To indicate add/delete/modify during CCN */
41270 u8 change_detected;
41271diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
41272index 2150618..7034215 100644
41273--- a/drivers/scsi/qla2xxx/qla_def.h
41274+++ b/drivers/scsi/qla2xxx/qla_def.h
41275@@ -2089,7 +2089,7 @@ struct isp_operations {
41276
41277 int (*get_flash_version) (struct scsi_qla_host *, void *);
41278 int (*start_scsi) (srb_t *);
41279-};
41280+} __no_const;
41281
41282 /* MSI-X Support *************************************************************/
41283
41284diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
41285index 81b5f29..2ae1fad 100644
41286--- a/drivers/scsi/qla4xxx/ql4_def.h
41287+++ b/drivers/scsi/qla4xxx/ql4_def.h
41288@@ -240,7 +240,7 @@ struct ddb_entry {
41289 atomic_t retry_relogin_timer; /* Min Time between relogins
41290 * (4000 only) */
41291 atomic_t relogin_timer; /* Max Time to wait for relogin to complete */
41292- atomic_t relogin_retry_count; /* Num of times relogin has been
41293+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
41294 * retried */
41295
41296 uint16_t port;
41297diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
41298index af8c323..515dd51 100644
41299--- a/drivers/scsi/qla4xxx/ql4_init.c
41300+++ b/drivers/scsi/qla4xxx/ql4_init.c
41301@@ -482,7 +482,7 @@ static struct ddb_entry * qla4xxx_alloc_ddb(struct scsi_qla_host *ha,
41302 atomic_set(&ddb_entry->port_down_timer, ha->port_down_retry_count);
41303 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
41304 atomic_set(&ddb_entry->relogin_timer, 0);
41305- atomic_set(&ddb_entry->relogin_retry_count, 0);
41306+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
41307 atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
41308 list_add_tail(&ddb_entry->list, &ha->ddb_list);
41309 ha->fw_ddb_index_map[fw_ddb_index] = ddb_entry;
41310@@ -1308,7 +1308,7 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha,
41311 atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
41312 atomic_set(&ddb_entry->port_down_timer,
41313 ha->port_down_retry_count);
41314- atomic_set(&ddb_entry->relogin_retry_count, 0);
41315+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
41316 atomic_set(&ddb_entry->relogin_timer, 0);
41317 clear_bit(DF_RELOGIN, &ddb_entry->flags);
41318 clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
41319diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
41320index 83c8b5e..a82b348 100644
41321--- a/drivers/scsi/qla4xxx/ql4_os.c
41322+++ b/drivers/scsi/qla4xxx/ql4_os.c
41323@@ -641,13 +641,13 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
41324 ddb_entry->fw_ddb_device_state ==
41325 DDB_DS_SESSION_FAILED) {
41326 /* Reset retry relogin timer */
41327- atomic_inc(&ddb_entry->relogin_retry_count);
41328+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
41329 DEBUG2(printk("scsi%ld: index[%d] relogin"
41330 " timed out-retrying"
41331 " relogin (%d)\n",
41332 ha->host_no,
41333 ddb_entry->fw_ddb_index,
41334- atomic_read(&ddb_entry->
41335+ atomic_read_unchecked(&ddb_entry->
41336 relogin_retry_count))
41337 );
41338 start_dpc++;
41339diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
41340index dd098ca..686ce01 100644
41341--- a/drivers/scsi/scsi.c
41342+++ b/drivers/scsi/scsi.c
41343@@ -652,7 +652,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
41344 unsigned long timeout;
41345 int rtn = 0;
41346
41347- atomic_inc(&cmd->device->iorequest_cnt);
41348+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
41349
41350 /* check if the device is still usable */
41351 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
41352diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
41353index bc3e363..e1a8e50 100644
41354--- a/drivers/scsi/scsi_debug.c
41355+++ b/drivers/scsi/scsi_debug.c
41356@@ -1395,6 +1395,8 @@ static int resp_mode_select(struct scsi_cmnd * scp, int mselect6,
41357 unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
41358 unsigned char *cmd = (unsigned char *)scp->cmnd;
41359
41360+ pax_track_stack();
41361+
41362 if ((errsts = check_readiness(scp, 1, devip)))
41363 return errsts;
41364 memset(arr, 0, sizeof(arr));
41365@@ -1492,6 +1494,8 @@ static int resp_log_sense(struct scsi_cmnd * scp,
41366 unsigned char arr[SDEBUG_MAX_LSENSE_SZ];
41367 unsigned char *cmd = (unsigned char *)scp->cmnd;
41368
41369+ pax_track_stack();
41370+
41371 if ((errsts = check_readiness(scp, 1, devip)))
41372 return errsts;
41373 memset(arr, 0, sizeof(arr));
41374diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
41375index 8df12522..c4c1472 100644
41376--- a/drivers/scsi/scsi_lib.c
41377+++ b/drivers/scsi/scsi_lib.c
41378@@ -1389,7 +1389,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
41379 shost = sdev->host;
41380 scsi_init_cmd_errh(cmd);
41381 cmd->result = DID_NO_CONNECT << 16;
41382- atomic_inc(&cmd->device->iorequest_cnt);
41383+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
41384
41385 /*
41386 * SCSI request completion path will do scsi_device_unbusy(),
41387@@ -1420,9 +1420,9 @@ static void scsi_softirq_done(struct request *rq)
41388 */
41389 cmd->serial_number = 0;
41390
41391- atomic_inc(&cmd->device->iodone_cnt);
41392+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
41393 if (cmd->result)
41394- atomic_inc(&cmd->device->ioerr_cnt);
41395+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
41396
41397 disposition = scsi_decide_disposition(cmd);
41398 if (disposition != SUCCESS &&
41399diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
41400index 91a93e0..eae0fe3 100644
41401--- a/drivers/scsi/scsi_sysfs.c
41402+++ b/drivers/scsi/scsi_sysfs.c
41403@@ -662,7 +662,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
41404 char *buf) \
41405 { \
41406 struct scsi_device *sdev = to_scsi_device(dev); \
41407- unsigned long long count = atomic_read(&sdev->field); \
41408+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
41409 return snprintf(buf, 20, "0x%llx\n", count); \
41410 } \
41411 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
41412diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
41413index 1030327..f91fd30 100644
41414--- a/drivers/scsi/scsi_tgt_lib.c
41415+++ b/drivers/scsi/scsi_tgt_lib.c
41416@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
41417 int err;
41418
41419 dprintk("%lx %u\n", uaddr, len);
41420- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
41421+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
41422 if (err) {
41423 /*
41424 * TODO: need to fixup sg_tablesize, max_segment_size,
41425diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
41426index db02e31..1b42ea9 100644
41427--- a/drivers/scsi/scsi_transport_fc.c
41428+++ b/drivers/scsi/scsi_transport_fc.c
41429@@ -480,7 +480,7 @@ MODULE_PARM_DESC(dev_loss_tmo,
41430 * Netlink Infrastructure
41431 */
41432
41433-static atomic_t fc_event_seq;
41434+static atomic_unchecked_t fc_event_seq;
41435
41436 /**
41437 * fc_get_event_number - Obtain the next sequential FC event number
41438@@ -493,7 +493,7 @@ static atomic_t fc_event_seq;
41439 u32
41440 fc_get_event_number(void)
41441 {
41442- return atomic_add_return(1, &fc_event_seq);
41443+ return atomic_add_return_unchecked(1, &fc_event_seq);
41444 }
41445 EXPORT_SYMBOL(fc_get_event_number);
41446
41447@@ -641,7 +641,7 @@ static __init int fc_transport_init(void)
41448 {
41449 int error;
41450
41451- atomic_set(&fc_event_seq, 0);
41452+ atomic_set_unchecked(&fc_event_seq, 0);
41453
41454 error = transport_class_register(&fc_host_class);
41455 if (error)
41456diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
41457index de2f8c4..63c5278 100644
41458--- a/drivers/scsi/scsi_transport_iscsi.c
41459+++ b/drivers/scsi/scsi_transport_iscsi.c
41460@@ -81,7 +81,7 @@ struct iscsi_internal {
41461 struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
41462 };
41463
41464-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
41465+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
41466 static struct workqueue_struct *iscsi_eh_timer_workq;
41467
41468 /*
41469@@ -728,7 +728,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
41470 int err;
41471
41472 ihost = shost->shost_data;
41473- session->sid = atomic_add_return(1, &iscsi_session_nr);
41474+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
41475
41476 if (id == ISCSI_MAX_TARGET) {
41477 for (id = 0; id < ISCSI_MAX_TARGET; id++) {
41478@@ -2060,7 +2060,7 @@ static __init int iscsi_transport_init(void)
41479 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
41480 ISCSI_TRANSPORT_VERSION);
41481
41482- atomic_set(&iscsi_session_nr, 0);
41483+ atomic_set_unchecked(&iscsi_session_nr, 0);
41484
41485 err = class_register(&iscsi_transport_class);
41486 if (err)
41487diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
41488index 21a045e..ec89e03 100644
41489--- a/drivers/scsi/scsi_transport_srp.c
41490+++ b/drivers/scsi/scsi_transport_srp.c
41491@@ -33,7 +33,7 @@
41492 #include "scsi_transport_srp_internal.h"
41493
41494 struct srp_host_attrs {
41495- atomic_t next_port_id;
41496+ atomic_unchecked_t next_port_id;
41497 };
41498 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
41499
41500@@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
41501 struct Scsi_Host *shost = dev_to_shost(dev);
41502 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
41503
41504- atomic_set(&srp_host->next_port_id, 0);
41505+ atomic_set_unchecked(&srp_host->next_port_id, 0);
41506 return 0;
41507 }
41508
41509@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
41510 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
41511 rport->roles = ids->roles;
41512
41513- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
41514+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
41515 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
41516
41517 transport_setup_device(&rport->dev);
41518diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
41519index 040f751..98a5ed2 100644
41520--- a/drivers/scsi/sg.c
41521+++ b/drivers/scsi/sg.c
41522@@ -1064,7 +1064,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
41523 sdp->disk->disk_name,
41524 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
41525 NULL,
41526- (char *)arg);
41527+ (char __user *)arg);
41528 case BLKTRACESTART:
41529 return blk_trace_startstop(sdp->device->request_queue, 1);
41530 case BLKTRACESTOP:
41531@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
41532 const struct file_operations * fops;
41533 };
41534
41535-static struct sg_proc_leaf sg_proc_leaf_arr[] = {
41536+static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
41537 {"allow_dio", &adio_fops},
41538 {"debug", &debug_fops},
41539 {"def_reserved_size", &dressz_fops},
41540@@ -2307,7 +2307,7 @@ sg_proc_init(void)
41541 {
41542 int k, mask;
41543 int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
41544- struct sg_proc_leaf * leaf;
41545+ const struct sg_proc_leaf * leaf;
41546
41547 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
41548 if (!sg_proc_sgp)
41549diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
41550index c19ca5e..3eb5959 100644
41551--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
41552+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
41553@@ -1758,6 +1758,8 @@ static int __devinit sym2_probe(struct pci_dev *pdev,
41554 int do_iounmap = 0;
41555 int do_disable_device = 1;
41556
41557+ pax_track_stack();
41558+
41559 memset(&sym_dev, 0, sizeof(sym_dev));
41560 memset(&nvram, 0, sizeof(nvram));
41561 sym_dev.pdev = pdev;
41562diff --git a/drivers/serial/kgdboc.c b/drivers/serial/kgdboc.c
41563index eadc1ab..2d81457 100644
41564--- a/drivers/serial/kgdboc.c
41565+++ b/drivers/serial/kgdboc.c
41566@@ -18,7 +18,7 @@
41567
41568 #define MAX_CONFIG_LEN 40
41569
41570-static struct kgdb_io kgdboc_io_ops;
41571+static const struct kgdb_io kgdboc_io_ops;
41572
41573 /* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
41574 static int configured = -1;
41575@@ -154,7 +154,7 @@ static void kgdboc_post_exp_handler(void)
41576 module_put(THIS_MODULE);
41577 }
41578
41579-static struct kgdb_io kgdboc_io_ops = {
41580+static const struct kgdb_io kgdboc_io_ops = {
41581 .name = "kgdboc",
41582 .read_char = kgdboc_get_char,
41583 .write_char = kgdboc_put_char,
41584diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
41585index b76f246..7f41af7 100644
41586--- a/drivers/spi/spi.c
41587+++ b/drivers/spi/spi.c
41588@@ -774,7 +774,7 @@ int spi_sync(struct spi_device *spi, struct spi_message *message)
41589 EXPORT_SYMBOL_GPL(spi_sync);
41590
41591 /* portable code must never pass more than 32 bytes */
41592-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
41593+#define SPI_BUFSIZ max(32U,SMP_CACHE_BYTES)
41594
41595 static u8 *buf;
41596
41597diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
41598index b9b37ff..19dfa23 100644
41599--- a/drivers/staging/android/binder.c
41600+++ b/drivers/staging/android/binder.c
41601@@ -2761,7 +2761,7 @@ static void binder_vma_close(struct vm_area_struct *vma)
41602 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
41603 }
41604
41605-static struct vm_operations_struct binder_vm_ops = {
41606+static const struct vm_operations_struct binder_vm_ops = {
41607 .open = binder_vma_open,
41608 .close = binder_vma_close,
41609 };
41610diff --git a/drivers/staging/b3dfg/b3dfg.c b/drivers/staging/b3dfg/b3dfg.c
41611index cda26bb..39fed3f 100644
41612--- a/drivers/staging/b3dfg/b3dfg.c
41613+++ b/drivers/staging/b3dfg/b3dfg.c
41614@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_area_struct *vma,
41615 return VM_FAULT_NOPAGE;
41616 }
41617
41618-static struct vm_operations_struct b3dfg_vm_ops = {
41619+static const struct vm_operations_struct b3dfg_vm_ops = {
41620 .fault = b3dfg_vma_fault,
41621 };
41622
41623@@ -848,7 +848,7 @@ static int b3dfg_mmap(struct file *filp, struct vm_area_struct *vma)
41624 return r;
41625 }
41626
41627-static struct file_operations b3dfg_fops = {
41628+static const struct file_operations b3dfg_fops = {
41629 .owner = THIS_MODULE,
41630 .open = b3dfg_open,
41631 .release = b3dfg_release,
41632diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
41633index 908f25a..c9a579b 100644
41634--- a/drivers/staging/comedi/comedi_fops.c
41635+++ b/drivers/staging/comedi/comedi_fops.c
41636@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct *area)
41637 mutex_unlock(&dev->mutex);
41638 }
41639
41640-static struct vm_operations_struct comedi_vm_ops = {
41641+static const struct vm_operations_struct comedi_vm_ops = {
41642 .close = comedi_unmap,
41643 };
41644
41645diff --git a/drivers/staging/dream/qdsp5/adsp_driver.c b/drivers/staging/dream/qdsp5/adsp_driver.c
41646index e55a0db..577b776 100644
41647--- a/drivers/staging/dream/qdsp5/adsp_driver.c
41648+++ b/drivers/staging/dream/qdsp5/adsp_driver.c
41649@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_device(struct inode *inode)
41650 static dev_t adsp_devno;
41651 static struct class *adsp_class;
41652
41653-static struct file_operations adsp_fops = {
41654+static const struct file_operations adsp_fops = {
41655 .owner = THIS_MODULE,
41656 .open = adsp_open,
41657 .unlocked_ioctl = adsp_ioctl,
41658diff --git a/drivers/staging/dream/qdsp5/audio_aac.c b/drivers/staging/dream/qdsp5/audio_aac.c
41659index ad2390f..4116ee8 100644
41660--- a/drivers/staging/dream/qdsp5/audio_aac.c
41661+++ b/drivers/staging/dream/qdsp5/audio_aac.c
41662@@ -1022,7 +1022,7 @@ done:
41663 return rc;
41664 }
41665
41666-static struct file_operations audio_aac_fops = {
41667+static const struct file_operations audio_aac_fops = {
41668 .owner = THIS_MODULE,
41669 .open = audio_open,
41670 .release = audio_release,
41671diff --git a/drivers/staging/dream/qdsp5/audio_amrnb.c b/drivers/staging/dream/qdsp5/audio_amrnb.c
41672index cd818a5..870b37b 100644
41673--- a/drivers/staging/dream/qdsp5/audio_amrnb.c
41674+++ b/drivers/staging/dream/qdsp5/audio_amrnb.c
41675@@ -833,7 +833,7 @@ done:
41676 return rc;
41677 }
41678
41679-static struct file_operations audio_amrnb_fops = {
41680+static const struct file_operations audio_amrnb_fops = {
41681 .owner = THIS_MODULE,
41682 .open = audamrnb_open,
41683 .release = audamrnb_release,
41684diff --git a/drivers/staging/dream/qdsp5/audio_evrc.c b/drivers/staging/dream/qdsp5/audio_evrc.c
41685index 4b43e18..cedafda 100644
41686--- a/drivers/staging/dream/qdsp5/audio_evrc.c
41687+++ b/drivers/staging/dream/qdsp5/audio_evrc.c
41688@@ -805,7 +805,7 @@ dma_fail:
41689 return rc;
41690 }
41691
41692-static struct file_operations audio_evrc_fops = {
41693+static const struct file_operations audio_evrc_fops = {
41694 .owner = THIS_MODULE,
41695 .open = audevrc_open,
41696 .release = audevrc_release,
41697diff --git a/drivers/staging/dream/qdsp5/audio_in.c b/drivers/staging/dream/qdsp5/audio_in.c
41698index 3d950a2..9431118 100644
41699--- a/drivers/staging/dream/qdsp5/audio_in.c
41700+++ b/drivers/staging/dream/qdsp5/audio_in.c
41701@@ -913,7 +913,7 @@ static int audpre_open(struct inode *inode, struct file *file)
41702 return 0;
41703 }
41704
41705-static struct file_operations audio_fops = {
41706+static const struct file_operations audio_fops = {
41707 .owner = THIS_MODULE,
41708 .open = audio_in_open,
41709 .release = audio_in_release,
41710@@ -922,7 +922,7 @@ static struct file_operations audio_fops = {
41711 .unlocked_ioctl = audio_in_ioctl,
41712 };
41713
41714-static struct file_operations audpre_fops = {
41715+static const struct file_operations audpre_fops = {
41716 .owner = THIS_MODULE,
41717 .open = audpre_open,
41718 .unlocked_ioctl = audpre_ioctl,
41719diff --git a/drivers/staging/dream/qdsp5/audio_mp3.c b/drivers/staging/dream/qdsp5/audio_mp3.c
41720index b95574f..286c2f4 100644
41721--- a/drivers/staging/dream/qdsp5/audio_mp3.c
41722+++ b/drivers/staging/dream/qdsp5/audio_mp3.c
41723@@ -941,7 +941,7 @@ done:
41724 return rc;
41725 }
41726
41727-static struct file_operations audio_mp3_fops = {
41728+static const struct file_operations audio_mp3_fops = {
41729 .owner = THIS_MODULE,
41730 .open = audio_open,
41731 .release = audio_release,
41732diff --git a/drivers/staging/dream/qdsp5/audio_out.c b/drivers/staging/dream/qdsp5/audio_out.c
41733index d1adcf6..f8f9833 100644
41734--- a/drivers/staging/dream/qdsp5/audio_out.c
41735+++ b/drivers/staging/dream/qdsp5/audio_out.c
41736@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inode, struct file *file)
41737 return 0;
41738 }
41739
41740-static struct file_operations audio_fops = {
41741+static const struct file_operations audio_fops = {
41742 .owner = THIS_MODULE,
41743 .open = audio_open,
41744 .release = audio_release,
41745@@ -819,7 +819,7 @@ static struct file_operations audio_fops = {
41746 .unlocked_ioctl = audio_ioctl,
41747 };
41748
41749-static struct file_operations audpp_fops = {
41750+static const struct file_operations audpp_fops = {
41751 .owner = THIS_MODULE,
41752 .open = audpp_open,
41753 .unlocked_ioctl = audpp_ioctl,
41754diff --git a/drivers/staging/dream/qdsp5/audio_qcelp.c b/drivers/staging/dream/qdsp5/audio_qcelp.c
41755index f0f50e3..f6b9dbc 100644
41756--- a/drivers/staging/dream/qdsp5/audio_qcelp.c
41757+++ b/drivers/staging/dream/qdsp5/audio_qcelp.c
41758@@ -816,7 +816,7 @@ err:
41759 return rc;
41760 }
41761
41762-static struct file_operations audio_qcelp_fops = {
41763+static const struct file_operations audio_qcelp_fops = {
41764 .owner = THIS_MODULE,
41765 .open = audqcelp_open,
41766 .release = audqcelp_release,
41767diff --git a/drivers/staging/dream/qdsp5/snd.c b/drivers/staging/dream/qdsp5/snd.c
41768index 037d7ff..5469ec3 100644
41769--- a/drivers/staging/dream/qdsp5/snd.c
41770+++ b/drivers/staging/dream/qdsp5/snd.c
41771@@ -242,7 +242,7 @@ err:
41772 return rc;
41773 }
41774
41775-static struct file_operations snd_fops = {
41776+static const struct file_operations snd_fops = {
41777 .owner = THIS_MODULE,
41778 .open = snd_open,
41779 .release = snd_release,
41780diff --git a/drivers/staging/dream/smd/smd_qmi.c b/drivers/staging/dream/smd/smd_qmi.c
41781index d4e7d88..0ea632a 100644
41782--- a/drivers/staging/dream/smd/smd_qmi.c
41783+++ b/drivers/staging/dream/smd/smd_qmi.c
41784@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, struct file *fp)
41785 return 0;
41786 }
41787
41788-static struct file_operations qmi_fops = {
41789+static const struct file_operations qmi_fops = {
41790 .owner = THIS_MODULE,
41791 .read = qmi_read,
41792 .write = qmi_write,
41793diff --git a/drivers/staging/dream/smd/smd_rpcrouter_device.c b/drivers/staging/dream/smd/smd_rpcrouter_device.c
41794index cd3910b..ff053d3 100644
41795--- a/drivers/staging/dream/smd/smd_rpcrouter_device.c
41796+++ b/drivers/staging/dream/smd/smd_rpcrouter_device.c
41797@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file *filp, unsigned int cmd,
41798 return rc;
41799 }
41800
41801-static struct file_operations rpcrouter_server_fops = {
41802+static const struct file_operations rpcrouter_server_fops = {
41803 .owner = THIS_MODULE,
41804 .open = rpcrouter_open,
41805 .release = rpcrouter_release,
41806@@ -224,7 +224,7 @@ static struct file_operations rpcrouter_server_fops = {
41807 .unlocked_ioctl = rpcrouter_ioctl,
41808 };
41809
41810-static struct file_operations rpcrouter_router_fops = {
41811+static const struct file_operations rpcrouter_router_fops = {
41812 .owner = THIS_MODULE,
41813 .open = rpcrouter_open,
41814 .release = rpcrouter_release,
41815diff --git a/drivers/staging/dst/dcore.c b/drivers/staging/dst/dcore.c
41816index c24e4e0..07665be 100644
41817--- a/drivers/staging/dst/dcore.c
41818+++ b/drivers/staging/dst/dcore.c
41819@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendisk *disk, fmode_t mode)
41820 return 0;
41821 }
41822
41823-static struct block_device_operations dst_blk_ops = {
41824+static const struct block_device_operations dst_blk_ops = {
41825 .open = dst_bdev_open,
41826 .release = dst_bdev_release,
41827 .owner = THIS_MODULE,
41828@@ -588,7 +588,7 @@ static struct dst_node *dst_alloc_node(struct dst_ctl *ctl,
41829 n->size = ctl->size;
41830
41831 atomic_set(&n->refcnt, 1);
41832- atomic_long_set(&n->gen, 0);
41833+ atomic_long_set_unchecked(&n->gen, 0);
41834 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
41835
41836 err = dst_node_sysfs_init(n);
41837diff --git a/drivers/staging/dst/trans.c b/drivers/staging/dst/trans.c
41838index 557d372..8d84422 100644
41839--- a/drivers/staging/dst/trans.c
41840+++ b/drivers/staging/dst/trans.c
41841@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, struct bio *bio)
41842 t->error = 0;
41843 t->retries = 0;
41844 atomic_set(&t->refcnt, 1);
41845- t->gen = atomic_long_inc_return(&n->gen);
41846+ t->gen = atomic_long_inc_return_unchecked(&n->gen);
41847
41848 t->enc = bio_data_dir(bio);
41849 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
41850diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c
41851index 94f7752..d051514 100644
41852--- a/drivers/staging/et131x/et1310_tx.c
41853+++ b/drivers/staging/et131x/et1310_tx.c
41854@@ -710,11 +710,11 @@ inline void et131x_free_send_packet(struct et131x_adapter *etdev,
41855 struct net_device_stats *stats = &etdev->net_stats;
41856
41857 if (pMpTcb->Flags & fMP_DEST_BROAD)
41858- atomic_inc(&etdev->Stats.brdcstxmt);
41859+ atomic_inc_unchecked(&etdev->Stats.brdcstxmt);
41860 else if (pMpTcb->Flags & fMP_DEST_MULTI)
41861- atomic_inc(&etdev->Stats.multixmt);
41862+ atomic_inc_unchecked(&etdev->Stats.multixmt);
41863 else
41864- atomic_inc(&etdev->Stats.unixmt);
41865+ atomic_inc_unchecked(&etdev->Stats.unixmt);
41866
41867 if (pMpTcb->Packet) {
41868 stats->tx_bytes += pMpTcb->Packet->len;
41869diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
41870index 1dfe06f..f469b4d 100644
41871--- a/drivers/staging/et131x/et131x_adapter.h
41872+++ b/drivers/staging/et131x/et131x_adapter.h
41873@@ -145,11 +145,11 @@ typedef struct _ce_stats_t {
41874 * operations
41875 */
41876 u32 unircv; /* # multicast packets received */
41877- atomic_t unixmt; /* # multicast packets for Tx */
41878+ atomic_unchecked_t unixmt; /* # multicast packets for Tx */
41879 u32 multircv; /* # multicast packets received */
41880- atomic_t multixmt; /* # multicast packets for Tx */
41881+ atomic_unchecked_t multixmt; /* # multicast packets for Tx */
41882 u32 brdcstrcv; /* # broadcast packets received */
41883- atomic_t brdcstxmt; /* # broadcast packets for Tx */
41884+ atomic_unchecked_t brdcstxmt; /* # broadcast packets for Tx */
41885 u32 norcvbuf; /* # Rx packets discarded */
41886 u32 noxmtbuf; /* # Tx packets discarded */
41887
41888diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
41889index 4bd353a..e28f455 100644
41890--- a/drivers/staging/go7007/go7007-v4l2.c
41891+++ b/drivers/staging/go7007/go7007-v4l2.c
41892@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41893 return 0;
41894 }
41895
41896-static struct vm_operations_struct go7007_vm_ops = {
41897+static const struct vm_operations_struct go7007_vm_ops = {
41898 .open = go7007_vm_open,
41899 .close = go7007_vm_close,
41900 .fault = go7007_vm_fault,
41901diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
41902index 366dc95..b974d87 100644
41903--- a/drivers/staging/hv/Channel.c
41904+++ b/drivers/staging/hv/Channel.c
41905@@ -464,8 +464,8 @@ int VmbusChannelEstablishGpadl(struct vmbus_channel *Channel, void *Kbuffer,
41906
41907 DPRINT_ENTER(VMBUS);
41908
41909- nextGpadlHandle = atomic_read(&gVmbusConnection.NextGpadlHandle);
41910- atomic_inc(&gVmbusConnection.NextGpadlHandle);
41911+ nextGpadlHandle = atomic_read_unchecked(&gVmbusConnection.NextGpadlHandle);
41912+ atomic_inc_unchecked(&gVmbusConnection.NextGpadlHandle);
41913
41914 VmbusChannelCreateGpadlHeader(Kbuffer, Size, &msgInfo, &msgCount);
41915 ASSERT(msgInfo != NULL);
41916diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c
41917index b12237f..01ae28a 100644
41918--- a/drivers/staging/hv/Hv.c
41919+++ b/drivers/staging/hv/Hv.c
41920@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, void *Input, void *Output)
41921 u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
41922 u32 outputAddressHi = outputAddress >> 32;
41923 u32 outputAddressLo = outputAddress & 0xFFFFFFFF;
41924- volatile void *hypercallPage = gHvContext.HypercallPage;
41925+ volatile void *hypercallPage = ktva_ktla(gHvContext.HypercallPage);
41926
41927 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
41928 Control, Input, Output);
41929diff --git a/drivers/staging/hv/VmbusApi.h b/drivers/staging/hv/VmbusApi.h
41930index d089bb1..2ebc158 100644
41931--- a/drivers/staging/hv/VmbusApi.h
41932+++ b/drivers/staging/hv/VmbusApi.h
41933@@ -109,7 +109,7 @@ struct vmbus_channel_interface {
41934 u32 *GpadlHandle);
41935 int (*TeardownGpadl)(struct hv_device *device, u32 GpadlHandle);
41936 void (*GetInfo)(struct hv_device *dev, struct hv_device_info *devinfo);
41937-};
41938+} __no_const;
41939
41940 /* Base driver object */
41941 struct hv_driver {
41942diff --git a/drivers/staging/hv/VmbusPrivate.h b/drivers/staging/hv/VmbusPrivate.h
41943index 5a37cce..6ecc88c 100644
41944--- a/drivers/staging/hv/VmbusPrivate.h
41945+++ b/drivers/staging/hv/VmbusPrivate.h
41946@@ -59,7 +59,7 @@ enum VMBUS_CONNECT_STATE {
41947 struct VMBUS_CONNECTION {
41948 enum VMBUS_CONNECT_STATE ConnectState;
41949
41950- atomic_t NextGpadlHandle;
41951+ atomic_unchecked_t NextGpadlHandle;
41952
41953 /*
41954 * Represents channel interrupts. Each bit position represents a
41955diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
41956index 871a202..ca50ddf 100644
41957--- a/drivers/staging/hv/blkvsc_drv.c
41958+++ b/drivers/staging/hv/blkvsc_drv.c
41959@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKVSC_RING_BUFFER_SIZE;
41960 /* The one and only one */
41961 static struct blkvsc_driver_context g_blkvsc_drv;
41962
41963-static struct block_device_operations block_ops = {
41964+static const struct block_device_operations block_ops = {
41965 .owner = THIS_MODULE,
41966 .open = blkvsc_open,
41967 .release = blkvsc_release,
41968diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
41969index 6acc49a..fbc8d46 100644
41970--- a/drivers/staging/hv/vmbus_drv.c
41971+++ b/drivers/staging/hv/vmbus_drv.c
41972@@ -532,7 +532,7 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj,
41973 to_device_context(root_device_obj);
41974 struct device_context *child_device_ctx =
41975 to_device_context(child_device_obj);
41976- static atomic_t device_num = ATOMIC_INIT(0);
41977+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
41978
41979 DPRINT_ENTER(VMBUS_DRV);
41980
41981@@ -541,7 +541,7 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj,
41982
41983 /* Set the device name. Otherwise, device_register() will fail. */
41984 dev_set_name(&child_device_ctx->device, "vmbus_0_%d",
41985- atomic_inc_return(&device_num));
41986+ atomic_inc_return_unchecked(&device_num));
41987
41988 /* The new device belongs to this bus */
41989 child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */
41990diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h
41991index d926189..17b19fd 100644
41992--- a/drivers/staging/iio/ring_generic.h
41993+++ b/drivers/staging/iio/ring_generic.h
41994@@ -87,7 +87,7 @@ struct iio_ring_access_funcs {
41995
41996 int (*is_enabled)(struct iio_ring_buffer *ring);
41997 int (*enable)(struct iio_ring_buffer *ring);
41998-};
41999+} __no_const;
42000
42001 /**
42002 * struct iio_ring_buffer - general ring buffer structure
42003diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
42004index 1b237b7..88c624e 100644
42005--- a/drivers/staging/octeon/ethernet-rx.c
42006+++ b/drivers/staging/octeon/ethernet-rx.c
42007@@ -406,11 +406,11 @@ void cvm_oct_tasklet_rx(unsigned long unused)
42008 /* Increment RX stats for virtual ports */
42009 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
42010 #ifdef CONFIG_64BIT
42011- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
42012- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
42013+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
42014+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
42015 #else
42016- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
42017- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
42018+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
42019+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
42020 #endif
42021 }
42022 netif_receive_skb(skb);
42023@@ -424,9 +424,9 @@ void cvm_oct_tasklet_rx(unsigned long unused)
42024 dev->name);
42025 */
42026 #ifdef CONFIG_64BIT
42027- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
42028+ atomic64_add_unchecked(1, (atomic64_t *)&priv->stats.rx_dropped);
42029 #else
42030- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
42031+ atomic_add_unchecked(1, (atomic_t *)&priv->stats.rx_dropped);
42032 #endif
42033 dev_kfree_skb_irq(skb);
42034 }
42035diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
42036index 492c502..d9909f1 100644
42037--- a/drivers/staging/octeon/ethernet.c
42038+++ b/drivers/staging/octeon/ethernet.c
42039@@ -294,11 +294,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
42040 * since the RX tasklet also increments it.
42041 */
42042 #ifdef CONFIG_64BIT
42043- atomic64_add(rx_status.dropped_packets,
42044- (atomic64_t *)&priv->stats.rx_dropped);
42045+ atomic64_add_unchecked(rx_status.dropped_packets,
42046+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
42047 #else
42048- atomic_add(rx_status.dropped_packets,
42049- (atomic_t *)&priv->stats.rx_dropped);
42050+ atomic_add_unchecked(rx_status.dropped_packets,
42051+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
42052 #endif
42053 }
42054
42055diff --git a/drivers/staging/otus/80211core/pub_zfi.h b/drivers/staging/otus/80211core/pub_zfi.h
42056index a35bd5d..28fff45 100644
42057--- a/drivers/staging/otus/80211core/pub_zfi.h
42058+++ b/drivers/staging/otus/80211core/pub_zfi.h
42059@@ -531,7 +531,7 @@ struct zsCbFuncTbl
42060 u8_t (*zfcbClassifyTxPacket)(zdev_t* dev, zbuf_t* buf);
42061
42062 void (*zfcbHwWatchDogNotify)(zdev_t* dev);
42063-};
42064+} __no_const;
42065
42066 extern void zfZeroMemory(u8_t* va, u16_t length);
42067 #define ZM_INIT_CB_FUNC_TABLE(p) zfZeroMemory((u8_t *)p, sizeof(struct zsCbFuncTbl));
42068diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
42069index c39a25f..696f5aa 100644
42070--- a/drivers/staging/panel/panel.c
42071+++ b/drivers/staging/panel/panel.c
42072@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *inode, struct file *file)
42073 return 0;
42074 }
42075
42076-static struct file_operations lcd_fops = {
42077+static const struct file_operations lcd_fops = {
42078 .write = lcd_write,
42079 .open = lcd_open,
42080 .release = lcd_release,
42081@@ -1565,7 +1565,7 @@ static int keypad_release(struct inode *inode, struct file *file)
42082 return 0;
42083 }
42084
42085-static struct file_operations keypad_fops = {
42086+static const struct file_operations keypad_fops = {
42087 .read = keypad_read, /* read */
42088 .open = keypad_open, /* open */
42089 .release = keypad_release, /* close */
42090diff --git a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c
42091index 270ebcb..37e46af 100644
42092--- a/drivers/staging/phison/phison.c
42093+++ b/drivers/staging/phison/phison.c
42094@@ -43,7 +43,7 @@ static struct scsi_host_template phison_sht = {
42095 ATA_BMDMA_SHT(DRV_NAME),
42096 };
42097
42098-static struct ata_port_operations phison_ops = {
42099+static const struct ata_port_operations phison_ops = {
42100 .inherits = &ata_bmdma_port_ops,
42101 .prereset = phison_pre_reset,
42102 };
42103diff --git a/drivers/staging/poch/poch.c b/drivers/staging/poch/poch.c
42104index 2eb8e3d..57616a7 100644
42105--- a/drivers/staging/poch/poch.c
42106+++ b/drivers/staging/poch/poch.c
42107@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inode, struct file *filp,
42108 return 0;
42109 }
42110
42111-static struct file_operations poch_fops = {
42112+static const struct file_operations poch_fops = {
42113 .owner = THIS_MODULE,
42114 .open = poch_open,
42115 .release = poch_release,
42116diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
42117index c94de31..19402bc 100644
42118--- a/drivers/staging/pohmelfs/inode.c
42119+++ b/drivers/staging/pohmelfs/inode.c
42120@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
42121 mutex_init(&psb->mcache_lock);
42122 psb->mcache_root = RB_ROOT;
42123 psb->mcache_timeout = msecs_to_jiffies(5000);
42124- atomic_long_set(&psb->mcache_gen, 0);
42125+ atomic_long_set_unchecked(&psb->mcache_gen, 0);
42126
42127 psb->trans_max_pages = 100;
42128
42129@@ -1865,7 +1865,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
42130 INIT_LIST_HEAD(&psb->crypto_ready_list);
42131 INIT_LIST_HEAD(&psb->crypto_active_list);
42132
42133- atomic_set(&psb->trans_gen, 1);
42134+ atomic_set_unchecked(&psb->trans_gen, 1);
42135 atomic_long_set(&psb->total_inodes, 0);
42136
42137 mutex_init(&psb->state_lock);
42138diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c
42139index e22665c..a2a9390 100644
42140--- a/drivers/staging/pohmelfs/mcache.c
42141+++ b/drivers/staging/pohmelfs/mcache.c
42142@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start
42143 m->data = data;
42144 m->start = start;
42145 m->size = size;
42146- m->gen = atomic_long_inc_return(&psb->mcache_gen);
42147+ m->gen = atomic_long_inc_return_unchecked(&psb->mcache_gen);
42148
42149 mutex_lock(&psb->mcache_lock);
42150 err = pohmelfs_mcache_insert(psb, m);
42151diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
42152index 623a07d..4035c19 100644
42153--- a/drivers/staging/pohmelfs/netfs.h
42154+++ b/drivers/staging/pohmelfs/netfs.h
42155@@ -570,14 +570,14 @@ struct pohmelfs_config;
42156 struct pohmelfs_sb {
42157 struct rb_root mcache_root;
42158 struct mutex mcache_lock;
42159- atomic_long_t mcache_gen;
42160+ atomic_long_unchecked_t mcache_gen;
42161 unsigned long mcache_timeout;
42162
42163 unsigned int idx;
42164
42165 unsigned int trans_retries;
42166
42167- atomic_t trans_gen;
42168+ atomic_unchecked_t trans_gen;
42169
42170 unsigned int crypto_attached_size;
42171 unsigned int crypto_align_size;
42172diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
42173index 36a2535..0591bf4 100644
42174--- a/drivers/staging/pohmelfs/trans.c
42175+++ b/drivers/staging/pohmelfs/trans.c
42176@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb)
42177 int err;
42178 struct netfs_cmd *cmd = t->iovec.iov_base;
42179
42180- t->gen = atomic_inc_return(&psb->trans_gen);
42181+ t->gen = atomic_inc_return_unchecked(&psb->trans_gen);
42182
42183 cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
42184 t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
42185diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
42186index f890a16..509ece8 100644
42187--- a/drivers/staging/sep/sep_driver.c
42188+++ b/drivers/staging/sep/sep_driver.c
42189@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver = {
42190 static dev_t sep_devno;
42191
42192 /* the files operations structure of the driver */
42193-static struct file_operations sep_file_operations = {
42194+static const struct file_operations sep_file_operations = {
42195 .owner = THIS_MODULE,
42196 .ioctl = sep_ioctl,
42197 .poll = sep_poll,
42198diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
42199index 5e16bc3..7655b10 100644
42200--- a/drivers/staging/usbip/usbip_common.h
42201+++ b/drivers/staging/usbip/usbip_common.h
42202@@ -374,7 +374,7 @@ struct usbip_device {
42203 void (*shutdown)(struct usbip_device *);
42204 void (*reset)(struct usbip_device *);
42205 void (*unusable)(struct usbip_device *);
42206- } eh_ops;
42207+ } __no_const eh_ops;
42208 };
42209
42210
42211diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
42212index 57f7946..d9df23d 100644
42213--- a/drivers/staging/usbip/vhci.h
42214+++ b/drivers/staging/usbip/vhci.h
42215@@ -92,7 +92,7 @@ struct vhci_hcd {
42216 unsigned resuming:1;
42217 unsigned long re_timeout;
42218
42219- atomic_t seqnum;
42220+ atomic_unchecked_t seqnum;
42221
42222 /*
42223 * NOTE:
42224diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
42225index 20cd7db..c2693ff 100644
42226--- a/drivers/staging/usbip/vhci_hcd.c
42227+++ b/drivers/staging/usbip/vhci_hcd.c
42228@@ -534,7 +534,7 @@ static void vhci_tx_urb(struct urb *urb)
42229 return;
42230 }
42231
42232- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
42233+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
42234 if (priv->seqnum == 0xffff)
42235 usbip_uinfo("seqnum max\n");
42236
42237@@ -793,7 +793,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
42238 return -ENOMEM;
42239 }
42240
42241- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
42242+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
42243 if (unlink->seqnum == 0xffff)
42244 usbip_uinfo("seqnum max\n");
42245
42246@@ -988,7 +988,7 @@ static int vhci_start(struct usb_hcd *hcd)
42247 vdev->rhport = rhport;
42248 }
42249
42250- atomic_set(&vhci->seqnum, 0);
42251+ atomic_set_unchecked(&vhci->seqnum, 0);
42252 spin_lock_init(&vhci->lock);
42253
42254
42255diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
42256index 7fd76fe..673695a 100644
42257--- a/drivers/staging/usbip/vhci_rx.c
42258+++ b/drivers/staging/usbip/vhci_rx.c
42259@@ -79,7 +79,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
42260 usbip_uerr("cannot find a urb of seqnum %u\n",
42261 pdu->base.seqnum);
42262 usbip_uinfo("max seqnum %d\n",
42263- atomic_read(&the_controller->seqnum));
42264+ atomic_read_unchecked(&the_controller->seqnum));
42265 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
42266 return;
42267 }
42268diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
42269index 7891288..8e31300 100644
42270--- a/drivers/staging/vme/devices/vme_user.c
42271+++ b/drivers/staging/vme/devices/vme_user.c
42272@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *, struct file *, unsigned int,
42273 static int __init vme_user_probe(struct device *, int, int);
42274 static int __exit vme_user_remove(struct device *, int, int);
42275
42276-static struct file_operations vme_user_fops = {
42277+static const struct file_operations vme_user_fops = {
42278 .open = vme_user_open,
42279 .release = vme_user_release,
42280 .read = vme_user_read,
42281diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
42282index 58abf44..00c1fc8 100644
42283--- a/drivers/staging/vt6655/hostap.c
42284+++ b/drivers/staging/vt6655/hostap.c
42285@@ -84,7 +84,7 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
42286 PSDevice apdev_priv;
42287 struct net_device *dev = pDevice->dev;
42288 int ret;
42289- const struct net_device_ops apdev_netdev_ops = {
42290+ net_device_ops_no_const apdev_netdev_ops = {
42291 .ndo_start_xmit = pDevice->tx_80211,
42292 };
42293
42294diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
42295index 0c8267a..db1f363 100644
42296--- a/drivers/staging/vt6656/hostap.c
42297+++ b/drivers/staging/vt6656/hostap.c
42298@@ -86,7 +86,7 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
42299 PSDevice apdev_priv;
42300 struct net_device *dev = pDevice->dev;
42301 int ret;
42302- const struct net_device_ops apdev_netdev_ops = {
42303+ net_device_ops_no_const apdev_netdev_ops = {
42304 .ndo_start_xmit = pDevice->tx_80211,
42305 };
42306
42307diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
42308index 925678b..da7f5ed 100644
42309--- a/drivers/staging/wlan-ng/hfa384x_usb.c
42310+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
42311@@ -205,7 +205,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
42312
42313 struct usbctlx_completor {
42314 int (*complete) (struct usbctlx_completor *);
42315-};
42316+} __no_const;
42317 typedef struct usbctlx_completor usbctlx_completor_t;
42318
42319 static int
42320diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
42321index 40de151..924f268 100644
42322--- a/drivers/telephony/ixj.c
42323+++ b/drivers/telephony/ixj.c
42324@@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
42325 bool mContinue;
42326 char *pIn, *pOut;
42327
42328+ pax_track_stack();
42329+
42330 if (!SCI_Prepare(j))
42331 return 0;
42332
42333diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
42334index e941367..b631f5a 100644
42335--- a/drivers/uio/uio.c
42336+++ b/drivers/uio/uio.c
42337@@ -23,6 +23,7 @@
42338 #include <linux/string.h>
42339 #include <linux/kobject.h>
42340 #include <linux/uio_driver.h>
42341+#include <asm/local.h>
42342
42343 #define UIO_MAX_DEVICES 255
42344
42345@@ -30,10 +31,10 @@ struct uio_device {
42346 struct module *owner;
42347 struct device *dev;
42348 int minor;
42349- atomic_t event;
42350+ atomic_unchecked_t event;
42351 struct fasync_struct *async_queue;
42352 wait_queue_head_t wait;
42353- int vma_count;
42354+ local_t vma_count;
42355 struct uio_info *info;
42356 struct kobject *map_dir;
42357 struct kobject *portio_dir;
42358@@ -129,7 +130,7 @@ static ssize_t map_type_show(struct kobject *kobj, struct attribute *attr,
42359 return entry->show(mem, buf);
42360 }
42361
42362-static struct sysfs_ops map_sysfs_ops = {
42363+static const struct sysfs_ops map_sysfs_ops = {
42364 .show = map_type_show,
42365 };
42366
42367@@ -217,7 +218,7 @@ static ssize_t portio_type_show(struct kobject *kobj, struct attribute *attr,
42368 return entry->show(port, buf);
42369 }
42370
42371-static struct sysfs_ops portio_sysfs_ops = {
42372+static const struct sysfs_ops portio_sysfs_ops = {
42373 .show = portio_type_show,
42374 };
42375
42376@@ -255,7 +256,7 @@ static ssize_t show_event(struct device *dev,
42377 struct uio_device *idev = dev_get_drvdata(dev);
42378 if (idev)
42379 return sprintf(buf, "%u\n",
42380- (unsigned int)atomic_read(&idev->event));
42381+ (unsigned int)atomic_read_unchecked(&idev->event));
42382 else
42383 return -ENODEV;
42384 }
42385@@ -424,7 +425,7 @@ void uio_event_notify(struct uio_info *info)
42386 {
42387 struct uio_device *idev = info->uio_dev;
42388
42389- atomic_inc(&idev->event);
42390+ atomic_inc_unchecked(&idev->event);
42391 wake_up_interruptible(&idev->wait);
42392 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
42393 }
42394@@ -477,7 +478,7 @@ static int uio_open(struct inode *inode, struct file *filep)
42395 }
42396
42397 listener->dev = idev;
42398- listener->event_count = atomic_read(&idev->event);
42399+ listener->event_count = atomic_read_unchecked(&idev->event);
42400 filep->private_data = listener;
42401
42402 if (idev->info->open) {
42403@@ -528,7 +529,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
42404 return -EIO;
42405
42406 poll_wait(filep, &idev->wait, wait);
42407- if (listener->event_count != atomic_read(&idev->event))
42408+ if (listener->event_count != atomic_read_unchecked(&idev->event))
42409 return POLLIN | POLLRDNORM;
42410 return 0;
42411 }
42412@@ -553,7 +554,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
42413 do {
42414 set_current_state(TASK_INTERRUPTIBLE);
42415
42416- event_count = atomic_read(&idev->event);
42417+ event_count = atomic_read_unchecked(&idev->event);
42418 if (event_count != listener->event_count) {
42419 if (copy_to_user(buf, &event_count, count))
42420 retval = -EFAULT;
42421@@ -624,13 +625,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
42422 static void uio_vma_open(struct vm_area_struct *vma)
42423 {
42424 struct uio_device *idev = vma->vm_private_data;
42425- idev->vma_count++;
42426+ local_inc(&idev->vma_count);
42427 }
42428
42429 static void uio_vma_close(struct vm_area_struct *vma)
42430 {
42431 struct uio_device *idev = vma->vm_private_data;
42432- idev->vma_count--;
42433+ local_dec(&idev->vma_count);
42434 }
42435
42436 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
42437@@ -840,7 +841,7 @@ int __uio_register_device(struct module *owner,
42438 idev->owner = owner;
42439 idev->info = info;
42440 init_waitqueue_head(&idev->wait);
42441- atomic_set(&idev->event, 0);
42442+ atomic_set_unchecked(&idev->event, 0);
42443
42444 ret = uio_get_minor(idev);
42445 if (ret)
42446diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
42447index fbea856..06efea6 100644
42448--- a/drivers/usb/atm/usbatm.c
42449+++ b/drivers/usb/atm/usbatm.c
42450@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
42451 if (printk_ratelimit())
42452 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
42453 __func__, vpi, vci);
42454- atomic_inc(&vcc->stats->rx_err);
42455+ atomic_inc_unchecked(&vcc->stats->rx_err);
42456 return;
42457 }
42458
42459@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
42460 if (length > ATM_MAX_AAL5_PDU) {
42461 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
42462 __func__, length, vcc);
42463- atomic_inc(&vcc->stats->rx_err);
42464+ atomic_inc_unchecked(&vcc->stats->rx_err);
42465 goto out;
42466 }
42467
42468@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
42469 if (sarb->len < pdu_length) {
42470 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
42471 __func__, pdu_length, sarb->len, vcc);
42472- atomic_inc(&vcc->stats->rx_err);
42473+ atomic_inc_unchecked(&vcc->stats->rx_err);
42474 goto out;
42475 }
42476
42477 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
42478 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
42479 __func__, vcc);
42480- atomic_inc(&vcc->stats->rx_err);
42481+ atomic_inc_unchecked(&vcc->stats->rx_err);
42482 goto out;
42483 }
42484
42485@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
42486 if (printk_ratelimit())
42487 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
42488 __func__, length);
42489- atomic_inc(&vcc->stats->rx_drop);
42490+ atomic_inc_unchecked(&vcc->stats->rx_drop);
42491 goto out;
42492 }
42493
42494@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
42495
42496 vcc->push(vcc, skb);
42497
42498- atomic_inc(&vcc->stats->rx);
42499+ atomic_inc_unchecked(&vcc->stats->rx);
42500 out:
42501 skb_trim(sarb, 0);
42502 }
42503@@ -616,7 +616,7 @@ static void usbatm_tx_process(unsigned long data)
42504 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
42505
42506 usbatm_pop(vcc, skb);
42507- atomic_inc(&vcc->stats->tx);
42508+ atomic_inc_unchecked(&vcc->stats->tx);
42509
42510 skb = skb_dequeue(&instance->sndqueue);
42511 }
42512@@ -775,11 +775,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
42513 if (!left--)
42514 return sprintf(page,
42515 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
42516- atomic_read(&atm_dev->stats.aal5.tx),
42517- atomic_read(&atm_dev->stats.aal5.tx_err),
42518- atomic_read(&atm_dev->stats.aal5.rx),
42519- atomic_read(&atm_dev->stats.aal5.rx_err),
42520- atomic_read(&atm_dev->stats.aal5.rx_drop));
42521+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
42522+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
42523+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
42524+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
42525+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
42526
42527 if (!left--) {
42528 if (instance->disconnected)
42529diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
42530index 24e6205..fe5a5d4 100644
42531--- a/drivers/usb/core/hcd.c
42532+++ b/drivers/usb/core/hcd.c
42533@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutdown);
42534
42535 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
42536
42537-struct usb_mon_operations *mon_ops;
42538+const struct usb_mon_operations *mon_ops;
42539
42540 /*
42541 * The registration is unlocked.
42542@@ -2226,7 +2226,7 @@ struct usb_mon_operations *mon_ops;
42543 * symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
42544 */
42545
42546-int usb_mon_register (struct usb_mon_operations *ops)
42547+int usb_mon_register (const struct usb_mon_operations *ops)
42548 {
42549
42550 if (mon_ops)
42551diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
42552index bcbe104..9cfd1c6 100644
42553--- a/drivers/usb/core/hcd.h
42554+++ b/drivers/usb/core/hcd.h
42555@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { }
42556 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
42557
42558 struct usb_mon_operations {
42559- void (*urb_submit)(struct usb_bus *bus, struct urb *urb);
42560- void (*urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
42561- void (*urb_complete)(struct usb_bus *bus, struct urb *urb, int status);
42562+ void (* const urb_submit)(struct usb_bus *bus, struct urb *urb);
42563+ void (* const urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
42564+ void (* const urb_complete)(struct usb_bus *bus, struct urb *urb, int status);
42565 /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
42566 };
42567
42568-extern struct usb_mon_operations *mon_ops;
42569+extern const struct usb_mon_operations *mon_ops;
42570
42571 static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
42572 {
42573@@ -514,7 +514,7 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,
42574 (*mon_ops->urb_complete)(bus, urb, status);
42575 }
42576
42577-int usb_mon_register(struct usb_mon_operations *ops);
42578+int usb_mon_register(const struct usb_mon_operations *ops);
42579 void usb_mon_deregister(void);
42580
42581 #else
42582diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
42583index 409cc94..a673bad 100644
42584--- a/drivers/usb/core/message.c
42585+++ b/drivers/usb/core/message.c
42586@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device *udev, int index)
42587 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
42588 if (buf) {
42589 len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE);
42590- if (len > 0) {
42591- smallbuf = kmalloc(++len, GFP_NOIO);
42592+ if (len++ > 0) {
42593+ smallbuf = kmalloc(len, GFP_NOIO);
42594 if (!smallbuf)
42595 return buf;
42596 memcpy(smallbuf, buf, len);
42597diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
42598index 62ff5e7..530b74e 100644
42599--- a/drivers/usb/misc/appledisplay.c
42600+++ b/drivers/usb/misc/appledisplay.c
42601@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightness(struct backlight_device *bd)
42602 return pdata->msgdata[1];
42603 }
42604
42605-static struct backlight_ops appledisplay_bl_data = {
42606+static const struct backlight_ops appledisplay_bl_data = {
42607 .get_brightness = appledisplay_bl_get_brightness,
42608 .update_status = appledisplay_bl_update_status,
42609 };
42610diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
42611index e0c2db3..bd8cb66 100644
42612--- a/drivers/usb/mon/mon_main.c
42613+++ b/drivers/usb/mon/mon_main.c
42614@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
42615 /*
42616 * Ops
42617 */
42618-static struct usb_mon_operations mon_ops_0 = {
42619+static const struct usb_mon_operations mon_ops_0 = {
42620 .urb_submit = mon_submit,
42621 .urb_submit_error = mon_submit_error,
42622 .urb_complete = mon_complete,
42623diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
42624index d6bea3e..60b250e 100644
42625--- a/drivers/usb/wusbcore/wa-hc.h
42626+++ b/drivers/usb/wusbcore/wa-hc.h
42627@@ -192,7 +192,7 @@ struct wahc {
42628 struct list_head xfer_delayed_list;
42629 spinlock_t xfer_list_lock;
42630 struct work_struct xfer_work;
42631- atomic_t xfer_id_count;
42632+ atomic_unchecked_t xfer_id_count;
42633 };
42634
42635
42636@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
42637 INIT_LIST_HEAD(&wa->xfer_delayed_list);
42638 spin_lock_init(&wa->xfer_list_lock);
42639 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
42640- atomic_set(&wa->xfer_id_count, 1);
42641+ atomic_set_unchecked(&wa->xfer_id_count, 1);
42642 }
42643
42644 /**
42645diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
42646index 613a5fc..3174865 100644
42647--- a/drivers/usb/wusbcore/wa-xfer.c
42648+++ b/drivers/usb/wusbcore/wa-xfer.c
42649@@ -293,7 +293,7 @@ out:
42650 */
42651 static void wa_xfer_id_init(struct wa_xfer *xfer)
42652 {
42653- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
42654+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
42655 }
42656
42657 /*
42658diff --git a/drivers/uwb/wlp/messages.c b/drivers/uwb/wlp/messages.c
42659index aa42fce..f8a828c 100644
42660--- a/drivers/uwb/wlp/messages.c
42661+++ b/drivers/uwb/wlp/messages.c
42662@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct sk_buff *skb)
42663 size_t len = skb->len;
42664 size_t used;
42665 ssize_t result;
42666- struct wlp_nonce enonce, rnonce;
42667+ struct wlp_nonce enonce = {{0}}, rnonce = {{0}};
42668 enum wlp_assc_error assc_err;
42669 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
42670 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
42671diff --git a/drivers/uwb/wlp/sysfs.c b/drivers/uwb/wlp/sysfs.c
42672index 0370399..6627c94 100644
42673--- a/drivers/uwb/wlp/sysfs.c
42674+++ b/drivers/uwb/wlp/sysfs.c
42675@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobject *kobj, struct attribute *attr,
42676 return ret;
42677 }
42678
42679-static
42680-struct sysfs_ops wss_sysfs_ops = {
42681+static const struct sysfs_ops wss_sysfs_ops = {
42682 .show = wlp_wss_attr_show,
42683 .store = wlp_wss_attr_store,
42684 };
42685diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
42686index 8c5e432..5ee90ea 100644
42687--- a/drivers/video/atmel_lcdfb.c
42688+++ b/drivers/video/atmel_lcdfb.c
42689@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struct backlight_device *bl)
42690 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
42691 }
42692
42693-static struct backlight_ops atmel_lcdc_bl_ops = {
42694+static const struct backlight_ops atmel_lcdc_bl_ops = {
42695 .update_status = atmel_bl_update_status,
42696 .get_brightness = atmel_bl_get_brightness,
42697 };
42698diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
42699index e4e4d43..66bcbcc 100644
42700--- a/drivers/video/aty/aty128fb.c
42701+++ b/drivers/video/aty/aty128fb.c
42702@@ -149,7 +149,7 @@ enum {
42703 };
42704
42705 /* Must match above enum */
42706-static const char *r128_family[] __devinitdata = {
42707+static const char *r128_family[] __devinitconst = {
42708 "AGP",
42709 "PCI",
42710 "PRO AGP",
42711@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(struct backlight_device *bd)
42712 return bd->props.brightness;
42713 }
42714
42715-static struct backlight_ops aty128_bl_data = {
42716+static const struct backlight_ops aty128_bl_data = {
42717 .get_brightness = aty128_bl_get_brightness,
42718 .update_status = aty128_bl_update_status,
42719 };
42720diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
42721index 913b4a4..9295a38 100644
42722--- a/drivers/video/aty/atyfb_base.c
42723+++ b/drivers/video/aty/atyfb_base.c
42724@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct backlight_device *bd)
42725 return bd->props.brightness;
42726 }
42727
42728-static struct backlight_ops aty_bl_data = {
42729+static const struct backlight_ops aty_bl_data = {
42730 .get_brightness = aty_bl_get_brightness,
42731 .update_status = aty_bl_update_status,
42732 };
42733diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
42734index 1a056ad..221bd6a 100644
42735--- a/drivers/video/aty/radeon_backlight.c
42736+++ b/drivers/video/aty/radeon_backlight.c
42737@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(struct backlight_device *bd)
42738 return bd->props.brightness;
42739 }
42740
42741-static struct backlight_ops radeon_bl_data = {
42742+static const struct backlight_ops radeon_bl_data = {
42743 .get_brightness = radeon_bl_get_brightness,
42744 .update_status = radeon_bl_update_status,
42745 };
42746diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
42747index ad05da5..3cb2cb9 100644
42748--- a/drivers/video/backlight/adp5520_bl.c
42749+++ b/drivers/video/backlight/adp5520_bl.c
42750@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(struct backlight_device *bl)
42751 return error ? data->current_brightness : reg_val;
42752 }
42753
42754-static struct backlight_ops adp5520_bl_ops = {
42755+static const struct backlight_ops adp5520_bl_ops = {
42756 .update_status = adp5520_bl_update_status,
42757 .get_brightness = adp5520_bl_get_brightness,
42758 };
42759diff --git a/drivers/video/backlight/adx_bl.c b/drivers/video/backlight/adx_bl.c
42760index 2c3bdfc..d769b0b 100644
42761--- a/drivers/video/backlight/adx_bl.c
42762+++ b/drivers/video/backlight/adx_bl.c
42763@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct fb_info *fb)
42764 return 1;
42765 }
42766
42767-static struct backlight_ops adx_backlight_ops = {
42768+static const struct backlight_ops adx_backlight_ops = {
42769 .options = 0,
42770 .update_status = adx_backlight_update_status,
42771 .get_brightness = adx_backlight_get_brightness,
42772diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c
42773index 505c082..6b6b3cc 100644
42774--- a/drivers/video/backlight/atmel-pwm-bl.c
42775+++ b/drivers/video/backlight/atmel-pwm-bl.c
42776@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct atmel_pwm_bl *pwmbl)
42777 return pwm_channel_enable(&pwmbl->pwmc);
42778 }
42779
42780-static struct backlight_ops atmel_pwm_bl_ops = {
42781+static const struct backlight_ops atmel_pwm_bl_ops = {
42782 .get_brightness = atmel_pwm_bl_get_intensity,
42783 .update_status = atmel_pwm_bl_set_intensity,
42784 };
42785diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
42786index 5e20e6e..89025e6 100644
42787--- a/drivers/video/backlight/backlight.c
42788+++ b/drivers/video/backlight/backlight.c
42789@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
42790 * ERR_PTR() or a pointer to the newly allocated device.
42791 */
42792 struct backlight_device *backlight_device_register(const char *name,
42793- struct device *parent, void *devdata, struct backlight_ops *ops)
42794+ struct device *parent, void *devdata, const struct backlight_ops *ops)
42795 {
42796 struct backlight_device *new_bd;
42797 int rc;
42798diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
42799index 9677494..b4bcf80 100644
42800--- a/drivers/video/backlight/corgi_lcd.c
42801+++ b/drivers/video/backlight/corgi_lcd.c
42802@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit)
42803 }
42804 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
42805
42806-static struct backlight_ops corgi_bl_ops = {
42807+static const struct backlight_ops corgi_bl_ops = {
42808 .get_brightness = corgi_bl_get_intensity,
42809 .update_status = corgi_bl_update_status,
42810 };
42811diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c
42812index b9fe62b..2914bf1 100644
42813--- a/drivers/video/backlight/cr_bllcd.c
42814+++ b/drivers/video/backlight/cr_bllcd.c
42815@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(struct backlight_device *bd)
42816 return intensity;
42817 }
42818
42819-static struct backlight_ops cr_backlight_ops = {
42820+static const struct backlight_ops cr_backlight_ops = {
42821 .get_brightness = cr_backlight_get_intensity,
42822 .update_status = cr_backlight_set_intensity,
42823 };
42824diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
42825index 701a108..feacfd5 100644
42826--- a/drivers/video/backlight/da903x_bl.c
42827+++ b/drivers/video/backlight/da903x_bl.c
42828@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightness(struct backlight_device *bl)
42829 return data->current_brightness;
42830 }
42831
42832-static struct backlight_ops da903x_backlight_ops = {
42833+static const struct backlight_ops da903x_backlight_ops = {
42834 .update_status = da903x_backlight_update_status,
42835 .get_brightness = da903x_backlight_get_brightness,
42836 };
42837diff --git a/drivers/video/backlight/generic_bl.c b/drivers/video/backlight/generic_bl.c
42838index 6d27f62..e6d348e 100644
42839--- a/drivers/video/backlight/generic_bl.c
42840+++ b/drivers/video/backlight/generic_bl.c
42841@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
42842 }
42843 EXPORT_SYMBOL(corgibl_limit_intensity);
42844
42845-static struct backlight_ops genericbl_ops = {
42846+static const struct backlight_ops genericbl_ops = {
42847 .options = BL_CORE_SUSPENDRESUME,
42848 .get_brightness = genericbl_get_intensity,
42849 .update_status = genericbl_send_intensity,
42850diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
42851index 7fb4eef..f7cc528 100644
42852--- a/drivers/video/backlight/hp680_bl.c
42853+++ b/drivers/video/backlight/hp680_bl.c
42854@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct backlight_device *bd)
42855 return current_intensity;
42856 }
42857
42858-static struct backlight_ops hp680bl_ops = {
42859+static const struct backlight_ops hp680bl_ops = {
42860 .get_brightness = hp680bl_get_intensity,
42861 .update_status = hp680bl_set_intensity,
42862 };
42863diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
42864index 7aed256..db9071f 100644
42865--- a/drivers/video/backlight/jornada720_bl.c
42866+++ b/drivers/video/backlight/jornada720_bl.c
42867@@ -93,7 +93,7 @@ out:
42868 return ret;
42869 }
42870
42871-static struct backlight_ops jornada_bl_ops = {
42872+static const struct backlight_ops jornada_bl_ops = {
42873 .get_brightness = jornada_bl_get_brightness,
42874 .update_status = jornada_bl_update_status,
42875 .options = BL_CORE_SUSPENDRESUME,
42876diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
42877index a38fda1..939e7b8 100644
42878--- a/drivers/video/backlight/kb3886_bl.c
42879+++ b/drivers/video/backlight/kb3886_bl.c
42880@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct backlight_device *bd)
42881 return kb3886bl_intensity;
42882 }
42883
42884-static struct backlight_ops kb3886bl_ops = {
42885+static const struct backlight_ops kb3886bl_ops = {
42886 .get_brightness = kb3886bl_get_intensity,
42887 .update_status = kb3886bl_send_intensity,
42888 };
42889diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
42890index 6b488b8..00a9591 100644
42891--- a/drivers/video/backlight/locomolcd.c
42892+++ b/drivers/video/backlight/locomolcd.c
42893@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struct backlight_device *bd)
42894 return current_intensity;
42895 }
42896
42897-static struct backlight_ops locomobl_data = {
42898+static const struct backlight_ops locomobl_data = {
42899 .get_brightness = locomolcd_get_intensity,
42900 .update_status = locomolcd_set_intensity,
42901 };
42902diff --git a/drivers/video/backlight/mbp_nvidia_bl.c b/drivers/video/backlight/mbp_nvidia_bl.c
42903index 99bdfa8..3dac448 100644
42904--- a/drivers/video/backlight/mbp_nvidia_bl.c
42905+++ b/drivers/video/backlight/mbp_nvidia_bl.c
42906@@ -33,7 +33,7 @@ struct dmi_match_data {
42907 unsigned long iostart;
42908 unsigned long iolen;
42909 /* Backlight operations structure. */
42910- struct backlight_ops backlight_ops;
42911+ const struct backlight_ops backlight_ops;
42912 };
42913
42914 /* Module parameters. */
42915diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
42916index cbad67e..3cf900e 100644
42917--- a/drivers/video/backlight/omap1_bl.c
42918+++ b/drivers/video/backlight/omap1_bl.c
42919@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct backlight_device *dev)
42920 return bl->current_intensity;
42921 }
42922
42923-static struct backlight_ops omapbl_ops = {
42924+static const struct backlight_ops omapbl_ops = {
42925 .get_brightness = omapbl_get_intensity,
42926 .update_status = omapbl_update_status,
42927 };
42928diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c
42929index 9edaf24..075786e 100644
42930--- a/drivers/video/backlight/progear_bl.c
42931+++ b/drivers/video/backlight/progear_bl.c
42932@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struct backlight_device *bd)
42933 return intensity - HW_LEVEL_MIN;
42934 }
42935
42936-static struct backlight_ops progearbl_ops = {
42937+static const struct backlight_ops progearbl_ops = {
42938 .get_brightness = progearbl_get_intensity,
42939 .update_status = progearbl_set_intensity,
42940 };
42941diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
42942index 8871662..df9e0b3 100644
42943--- a/drivers/video/backlight/pwm_bl.c
42944+++ b/drivers/video/backlight/pwm_bl.c
42945@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(struct backlight_device *bl)
42946 return bl->props.brightness;
42947 }
42948
42949-static struct backlight_ops pwm_backlight_ops = {
42950+static const struct backlight_ops pwm_backlight_ops = {
42951 .update_status = pwm_backlight_update_status,
42952 .get_brightness = pwm_backlight_get_brightness,
42953 };
42954diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
42955index 43edbad..e14ce4d 100644
42956--- a/drivers/video/backlight/tosa_bl.c
42957+++ b/drivers/video/backlight/tosa_bl.c
42958@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct backlight_device *dev)
42959 return props->brightness;
42960 }
42961
42962-static struct backlight_ops bl_ops = {
42963+static const struct backlight_ops bl_ops = {
42964 .get_brightness = tosa_bl_get_brightness,
42965 .update_status = tosa_bl_update_status,
42966 };
42967diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
42968index 467bdb7..e32add3 100644
42969--- a/drivers/video/backlight/wm831x_bl.c
42970+++ b/drivers/video/backlight/wm831x_bl.c
42971@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightness(struct backlight_device *bl)
42972 return data->current_brightness;
42973 }
42974
42975-static struct backlight_ops wm831x_backlight_ops = {
42976+static const struct backlight_ops wm831x_backlight_ops = {
42977 .options = BL_CORE_SUSPENDRESUME,
42978 .update_status = wm831x_backlight_update_status,
42979 .get_brightness = wm831x_backlight_get_brightness,
42980diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
42981index e49ae5e..db4e6f7 100644
42982--- a/drivers/video/bf54x-lq043fb.c
42983+++ b/drivers/video/bf54x-lq043fb.c
42984@@ -463,7 +463,7 @@ static int bl_get_brightness(struct backlight_device *bd)
42985 return 0;
42986 }
42987
42988-static struct backlight_ops bfin_lq043fb_bl_ops = {
42989+static const struct backlight_ops bfin_lq043fb_bl_ops = {
42990 .get_brightness = bl_get_brightness,
42991 };
42992
42993diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
42994index 2c72a7c..d523e52 100644
42995--- a/drivers/video/bfin-t350mcqb-fb.c
42996+++ b/drivers/video/bfin-t350mcqb-fb.c
42997@@ -381,7 +381,7 @@ static int bl_get_brightness(struct backlight_device *bd)
42998 return 0;
42999 }
43000
43001-static struct backlight_ops bfin_lq043fb_bl_ops = {
43002+static const struct backlight_ops bfin_lq043fb_bl_ops = {
43003 .get_brightness = bl_get_brightness,
43004 };
43005
43006diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
43007index f53b9f1..958bf4e 100644
43008--- a/drivers/video/fbcmap.c
43009+++ b/drivers/video/fbcmap.c
43010@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
43011 rc = -ENODEV;
43012 goto out;
43013 }
43014- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
43015- !info->fbops->fb_setcmap)) {
43016+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
43017 rc = -EINVAL;
43018 goto out1;
43019 }
43020diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
43021index 99bbd28..ad3829e 100644
43022--- a/drivers/video/fbmem.c
43023+++ b/drivers/video/fbmem.c
43024@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
43025 image->dx += image->width + 8;
43026 }
43027 } else if (rotate == FB_ROTATE_UD) {
43028- for (x = 0; x < num && image->dx >= 0; x++) {
43029+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
43030 info->fbops->fb_imageblit(info, image);
43031 image->dx -= image->width + 8;
43032 }
43033@@ -415,7 +415,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
43034 image->dy += image->height + 8;
43035 }
43036 } else if (rotate == FB_ROTATE_CCW) {
43037- for (x = 0; x < num && image->dy >= 0; x++) {
43038+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
43039 info->fbops->fb_imageblit(info, image);
43040 image->dy -= image->height + 8;
43041 }
43042@@ -915,6 +915,8 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
43043 int flags = info->flags;
43044 int ret = 0;
43045
43046+ pax_track_stack();
43047+
43048 if (var->activate & FB_ACTIVATE_INV_MODE) {
43049 struct fb_videomode mode1, mode2;
43050
43051@@ -1040,6 +1042,8 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
43052 void __user *argp = (void __user *)arg;
43053 long ret = 0;
43054
43055+ pax_track_stack();
43056+
43057 switch (cmd) {
43058 case FBIOGET_VSCREENINFO:
43059 if (!lock_fb_info(info))
43060@@ -1119,7 +1123,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
43061 return -EFAULT;
43062 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
43063 return -EINVAL;
43064- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
43065+ if (con2fb.framebuffer >= FB_MAX)
43066 return -EINVAL;
43067 if (!registered_fb[con2fb.framebuffer])
43068 request_module("fb%d", con2fb.framebuffer);
43069diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
43070index f20eff8..3e4f622 100644
43071--- a/drivers/video/geode/gx1fb_core.c
43072+++ b/drivers/video/geode/gx1fb_core.c
43073@@ -30,7 +30,7 @@ static int crt_option = 1;
43074 static char panel_option[32] = "";
43075
43076 /* Modes relevant to the GX1 (taken from modedb.c) */
43077-static const struct fb_videomode __initdata gx1_modedb[] = {
43078+static const struct fb_videomode __initconst gx1_modedb[] = {
43079 /* 640x480-60 VESA */
43080 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
43081 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
43082diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
43083index 896e53d..4d87d0b 100644
43084--- a/drivers/video/gxt4500.c
43085+++ b/drivers/video/gxt4500.c
43086@@ -156,7 +156,7 @@ struct gxt4500_par {
43087 static char *mode_option;
43088
43089 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
43090-static const struct fb_videomode defaultmode __devinitdata = {
43091+static const struct fb_videomode defaultmode __devinitconst = {
43092 .refresh = 60,
43093 .xres = 1280,
43094 .yres = 1024,
43095@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
43096 return 0;
43097 }
43098
43099-static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
43100+static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
43101 .id = "IBM GXT4500P",
43102 .type = FB_TYPE_PACKED_PIXELS,
43103 .visual = FB_VISUAL_PSEUDOCOLOR,
43104diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
43105index f5bedee..28c6028 100644
43106--- a/drivers/video/i810/i810_accel.c
43107+++ b/drivers/video/i810/i810_accel.c
43108@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
43109 }
43110 }
43111 printk("ringbuffer lockup!!!\n");
43112+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
43113 i810_report_error(mmio);
43114 par->dev_flags |= LOCKUP;
43115 info->pixmap.scan_align = 1;
43116diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
43117index 5743ea2..457f82c 100644
43118--- a/drivers/video/i810/i810_main.c
43119+++ b/drivers/video/i810/i810_main.c
43120@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
43121 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
43122
43123 /* PCI */
43124-static const char *i810_pci_list[] __devinitdata = {
43125+static const char *i810_pci_list[] __devinitconst = {
43126 "Intel(R) 810 Framebuffer Device" ,
43127 "Intel(R) 810-DC100 Framebuffer Device" ,
43128 "Intel(R) 810E Framebuffer Device" ,
43129diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
43130index 3c14e43..eafa544 100644
43131--- a/drivers/video/logo/logo_linux_clut224.ppm
43132+++ b/drivers/video/logo/logo_linux_clut224.ppm
43133@@ -1,1604 +1,1123 @@
43134 P3
43135-# Standard 224-color Linux logo
43136 80 80
43137 255
43138- 0 0 0 0 0 0 0 0 0 0 0 0
43139- 0 0 0 0 0 0 0 0 0 0 0 0
43140- 0 0 0 0 0 0 0 0 0 0 0 0
43141- 0 0 0 0 0 0 0 0 0 0 0 0
43142- 0 0 0 0 0 0 0 0 0 0 0 0
43143- 0 0 0 0 0 0 0 0 0 0 0 0
43144- 0 0 0 0 0 0 0 0 0 0 0 0
43145- 0 0 0 0 0 0 0 0 0 0 0 0
43146- 0 0 0 0 0 0 0 0 0 0 0 0
43147- 6 6 6 6 6 6 10 10 10 10 10 10
43148- 10 10 10 6 6 6 6 6 6 6 6 6
43149- 0 0 0 0 0 0 0 0 0 0 0 0
43150- 0 0 0 0 0 0 0 0 0 0 0 0
43151- 0 0 0 0 0 0 0 0 0 0 0 0
43152- 0 0 0 0 0 0 0 0 0 0 0 0
43153- 0 0 0 0 0 0 0 0 0 0 0 0
43154- 0 0 0 0 0 0 0 0 0 0 0 0
43155- 0 0 0 0 0 0 0 0 0 0 0 0
43156- 0 0 0 0 0 0 0 0 0 0 0 0
43157- 0 0 0 0 0 0 0 0 0 0 0 0
43158- 0 0 0 0 0 0 0 0 0 0 0 0
43159- 0 0 0 0 0 0 0 0 0 0 0 0
43160- 0 0 0 0 0 0 0 0 0 0 0 0
43161- 0 0 0 0 0 0 0 0 0 0 0 0
43162- 0 0 0 0 0 0 0 0 0 0 0 0
43163- 0 0 0 0 0 0 0 0 0 0 0 0
43164- 0 0 0 0 0 0 0 0 0 0 0 0
43165- 0 0 0 0 0 0 0 0 0 0 0 0
43166- 0 0 0 6 6 6 10 10 10 14 14 14
43167- 22 22 22 26 26 26 30 30 30 34 34 34
43168- 30 30 30 30 30 30 26 26 26 18 18 18
43169- 14 14 14 10 10 10 6 6 6 0 0 0
43170- 0 0 0 0 0 0 0 0 0 0 0 0
43171- 0 0 0 0 0 0 0 0 0 0 0 0
43172- 0 0 0 0 0 0 0 0 0 0 0 0
43173- 0 0 0 0 0 0 0 0 0 0 0 0
43174- 0 0 0 0 0 0 0 0 0 0 0 0
43175- 0 0 0 0 0 0 0 0 0 0 0 0
43176- 0 0 0 0 0 0 0 0 0 0 0 0
43177- 0 0 0 0 0 0 0 0 0 0 0 0
43178- 0 0 0 0 0 0 0 0 0 0 0 0
43179- 0 0 0 0 0 1 0 0 1 0 0 0
43180- 0 0 0 0 0 0 0 0 0 0 0 0
43181- 0 0 0 0 0 0 0 0 0 0 0 0
43182- 0 0 0 0 0 0 0 0 0 0 0 0
43183- 0 0 0 0 0 0 0 0 0 0 0 0
43184- 0 0 0 0 0 0 0 0 0 0 0 0
43185- 0 0 0 0 0 0 0 0 0 0 0 0
43186- 6 6 6 14 14 14 26 26 26 42 42 42
43187- 54 54 54 66 66 66 78 78 78 78 78 78
43188- 78 78 78 74 74 74 66 66 66 54 54 54
43189- 42 42 42 26 26 26 18 18 18 10 10 10
43190- 6 6 6 0 0 0 0 0 0 0 0 0
43191- 0 0 0 0 0 0 0 0 0 0 0 0
43192- 0 0 0 0 0 0 0 0 0 0 0 0
43193- 0 0 0 0 0 0 0 0 0 0 0 0
43194- 0 0 0 0 0 0 0 0 0 0 0 0
43195- 0 0 0 0 0 0 0 0 0 0 0 0
43196- 0 0 0 0 0 0 0 0 0 0 0 0
43197- 0 0 0 0 0 0 0 0 0 0 0 0
43198- 0 0 0 0 0 0 0 0 0 0 0 0
43199- 0 0 1 0 0 0 0 0 0 0 0 0
43200- 0 0 0 0 0 0 0 0 0 0 0 0
43201- 0 0 0 0 0 0 0 0 0 0 0 0
43202- 0 0 0 0 0 0 0 0 0 0 0 0
43203- 0 0 0 0 0 0 0 0 0 0 0 0
43204- 0 0 0 0 0 0 0 0 0 0 0 0
43205- 0 0 0 0 0 0 0 0 0 10 10 10
43206- 22 22 22 42 42 42 66 66 66 86 86 86
43207- 66 66 66 38 38 38 38 38 38 22 22 22
43208- 26 26 26 34 34 34 54 54 54 66 66 66
43209- 86 86 86 70 70 70 46 46 46 26 26 26
43210- 14 14 14 6 6 6 0 0 0 0 0 0
43211- 0 0 0 0 0 0 0 0 0 0 0 0
43212- 0 0 0 0 0 0 0 0 0 0 0 0
43213- 0 0 0 0 0 0 0 0 0 0 0 0
43214- 0 0 0 0 0 0 0 0 0 0 0 0
43215- 0 0 0 0 0 0 0 0 0 0 0 0
43216- 0 0 0 0 0 0 0 0 0 0 0 0
43217- 0 0 0 0 0 0 0 0 0 0 0 0
43218- 0 0 0 0 0 0 0 0 0 0 0 0
43219- 0 0 1 0 0 1 0 0 1 0 0 0
43220- 0 0 0 0 0 0 0 0 0 0 0 0
43221- 0 0 0 0 0 0 0 0 0 0 0 0
43222- 0 0 0 0 0 0 0 0 0 0 0 0
43223- 0 0 0 0 0 0 0 0 0 0 0 0
43224- 0 0 0 0 0 0 0 0 0 0 0 0
43225- 0 0 0 0 0 0 10 10 10 26 26 26
43226- 50 50 50 82 82 82 58 58 58 6 6 6
43227- 2 2 6 2 2 6 2 2 6 2 2 6
43228- 2 2 6 2 2 6 2 2 6 2 2 6
43229- 6 6 6 54 54 54 86 86 86 66 66 66
43230- 38 38 38 18 18 18 6 6 6 0 0 0
43231- 0 0 0 0 0 0 0 0 0 0 0 0
43232- 0 0 0 0 0 0 0 0 0 0 0 0
43233- 0 0 0 0 0 0 0 0 0 0 0 0
43234- 0 0 0 0 0 0 0 0 0 0 0 0
43235- 0 0 0 0 0 0 0 0 0 0 0 0
43236- 0 0 0 0 0 0 0 0 0 0 0 0
43237- 0 0 0 0 0 0 0 0 0 0 0 0
43238- 0 0 0 0 0 0 0 0 0 0 0 0
43239- 0 0 0 0 0 0 0 0 0 0 0 0
43240- 0 0 0 0 0 0 0 0 0 0 0 0
43241- 0 0 0 0 0 0 0 0 0 0 0 0
43242- 0 0 0 0 0 0 0 0 0 0 0 0
43243- 0 0 0 0 0 0 0 0 0 0 0 0
43244- 0 0 0 0 0 0 0 0 0 0 0 0
43245- 0 0 0 6 6 6 22 22 22 50 50 50
43246- 78 78 78 34 34 34 2 2 6 2 2 6
43247- 2 2 6 2 2 6 2 2 6 2 2 6
43248- 2 2 6 2 2 6 2 2 6 2 2 6
43249- 2 2 6 2 2 6 6 6 6 70 70 70
43250- 78 78 78 46 46 46 22 22 22 6 6 6
43251- 0 0 0 0 0 0 0 0 0 0 0 0
43252- 0 0 0 0 0 0 0 0 0 0 0 0
43253- 0 0 0 0 0 0 0 0 0 0 0 0
43254- 0 0 0 0 0 0 0 0 0 0 0 0
43255- 0 0 0 0 0 0 0 0 0 0 0 0
43256- 0 0 0 0 0 0 0 0 0 0 0 0
43257- 0 0 0 0 0 0 0 0 0 0 0 0
43258- 0 0 0 0 0 0 0 0 0 0 0 0
43259- 0 0 1 0 0 1 0 0 1 0 0 0
43260- 0 0 0 0 0 0 0 0 0 0 0 0
43261- 0 0 0 0 0 0 0 0 0 0 0 0
43262- 0 0 0 0 0 0 0 0 0 0 0 0
43263- 0 0 0 0 0 0 0 0 0 0 0 0
43264- 0 0 0 0 0 0 0 0 0 0 0 0
43265- 6 6 6 18 18 18 42 42 42 82 82 82
43266- 26 26 26 2 2 6 2 2 6 2 2 6
43267- 2 2 6 2 2 6 2 2 6 2 2 6
43268- 2 2 6 2 2 6 2 2 6 14 14 14
43269- 46 46 46 34 34 34 6 6 6 2 2 6
43270- 42 42 42 78 78 78 42 42 42 18 18 18
43271- 6 6 6 0 0 0 0 0 0 0 0 0
43272- 0 0 0 0 0 0 0 0 0 0 0 0
43273- 0 0 0 0 0 0 0 0 0 0 0 0
43274- 0 0 0 0 0 0 0 0 0 0 0 0
43275- 0 0 0 0 0 0 0 0 0 0 0 0
43276- 0 0 0 0 0 0 0 0 0 0 0 0
43277- 0 0 0 0 0 0 0 0 0 0 0 0
43278- 0 0 0 0 0 0 0 0 0 0 0 0
43279- 0 0 1 0 0 0 0 0 1 0 0 0
43280- 0 0 0 0 0 0 0 0 0 0 0 0
43281- 0 0 0 0 0 0 0 0 0 0 0 0
43282- 0 0 0 0 0 0 0 0 0 0 0 0
43283- 0 0 0 0 0 0 0 0 0 0 0 0
43284- 0 0 0 0 0 0 0 0 0 0 0 0
43285- 10 10 10 30 30 30 66 66 66 58 58 58
43286- 2 2 6 2 2 6 2 2 6 2 2 6
43287- 2 2 6 2 2 6 2 2 6 2 2 6
43288- 2 2 6 2 2 6 2 2 6 26 26 26
43289- 86 86 86 101 101 101 46 46 46 10 10 10
43290- 2 2 6 58 58 58 70 70 70 34 34 34
43291- 10 10 10 0 0 0 0 0 0 0 0 0
43292- 0 0 0 0 0 0 0 0 0 0 0 0
43293- 0 0 0 0 0 0 0 0 0 0 0 0
43294- 0 0 0 0 0 0 0 0 0 0 0 0
43295- 0 0 0 0 0 0 0 0 0 0 0 0
43296- 0 0 0 0 0 0 0 0 0 0 0 0
43297- 0 0 0 0 0 0 0 0 0 0 0 0
43298- 0 0 0 0 0 0 0 0 0 0 0 0
43299- 0 0 1 0 0 1 0 0 1 0 0 0
43300- 0 0 0 0 0 0 0 0 0 0 0 0
43301- 0 0 0 0 0 0 0 0 0 0 0 0
43302- 0 0 0 0 0 0 0 0 0 0 0 0
43303- 0 0 0 0 0 0 0 0 0 0 0 0
43304- 0 0 0 0 0 0 0 0 0 0 0 0
43305- 14 14 14 42 42 42 86 86 86 10 10 10
43306- 2 2 6 2 2 6 2 2 6 2 2 6
43307- 2 2 6 2 2 6 2 2 6 2 2 6
43308- 2 2 6 2 2 6 2 2 6 30 30 30
43309- 94 94 94 94 94 94 58 58 58 26 26 26
43310- 2 2 6 6 6 6 78 78 78 54 54 54
43311- 22 22 22 6 6 6 0 0 0 0 0 0
43312- 0 0 0 0 0 0 0 0 0 0 0 0
43313- 0 0 0 0 0 0 0 0 0 0 0 0
43314- 0 0 0 0 0 0 0 0 0 0 0 0
43315- 0 0 0 0 0 0 0 0 0 0 0 0
43316- 0 0 0 0 0 0 0 0 0 0 0 0
43317- 0 0 0 0 0 0 0 0 0 0 0 0
43318- 0 0 0 0 0 0 0 0 0 0 0 0
43319- 0 0 0 0 0 0 0 0 0 0 0 0
43320- 0 0 0 0 0 0 0 0 0 0 0 0
43321- 0 0 0 0 0 0 0 0 0 0 0 0
43322- 0 0 0 0 0 0 0 0 0 0 0 0
43323- 0 0 0 0 0 0 0 0 0 0 0 0
43324- 0 0 0 0 0 0 0 0 0 6 6 6
43325- 22 22 22 62 62 62 62 62 62 2 2 6
43326- 2 2 6 2 2 6 2 2 6 2 2 6
43327- 2 2 6 2 2 6 2 2 6 2 2 6
43328- 2 2 6 2 2 6 2 2 6 26 26 26
43329- 54 54 54 38 38 38 18 18 18 10 10 10
43330- 2 2 6 2 2 6 34 34 34 82 82 82
43331- 38 38 38 14 14 14 0 0 0 0 0 0
43332- 0 0 0 0 0 0 0 0 0 0 0 0
43333- 0 0 0 0 0 0 0 0 0 0 0 0
43334- 0 0 0 0 0 0 0 0 0 0 0 0
43335- 0 0 0 0 0 0 0 0 0 0 0 0
43336- 0 0 0 0 0 0 0 0 0 0 0 0
43337- 0 0 0 0 0 0 0 0 0 0 0 0
43338- 0 0 0 0 0 0 0 0 0 0 0 0
43339- 0 0 0 0 0 1 0 0 1 0 0 0
43340- 0 0 0 0 0 0 0 0 0 0 0 0
43341- 0 0 0 0 0 0 0 0 0 0 0 0
43342- 0 0 0 0 0 0 0 0 0 0 0 0
43343- 0 0 0 0 0 0 0 0 0 0 0 0
43344- 0 0 0 0 0 0 0 0 0 6 6 6
43345- 30 30 30 78 78 78 30 30 30 2 2 6
43346- 2 2 6 2 2 6 2 2 6 2 2 6
43347- 2 2 6 2 2 6 2 2 6 2 2 6
43348- 2 2 6 2 2 6 2 2 6 10 10 10
43349- 10 10 10 2 2 6 2 2 6 2 2 6
43350- 2 2 6 2 2 6 2 2 6 78 78 78
43351- 50 50 50 18 18 18 6 6 6 0 0 0
43352- 0 0 0 0 0 0 0 0 0 0 0 0
43353- 0 0 0 0 0 0 0 0 0 0 0 0
43354- 0 0 0 0 0 0 0 0 0 0 0 0
43355- 0 0 0 0 0 0 0 0 0 0 0 0
43356- 0 0 0 0 0 0 0 0 0 0 0 0
43357- 0 0 0 0 0 0 0 0 0 0 0 0
43358- 0 0 0 0 0 0 0 0 0 0 0 0
43359- 0 0 1 0 0 0 0 0 0 0 0 0
43360- 0 0 0 0 0 0 0 0 0 0 0 0
43361- 0 0 0 0 0 0 0 0 0 0 0 0
43362- 0 0 0 0 0 0 0 0 0 0 0 0
43363- 0 0 0 0 0 0 0 0 0 0 0 0
43364- 0 0 0 0 0 0 0 0 0 10 10 10
43365- 38 38 38 86 86 86 14 14 14 2 2 6
43366- 2 2 6 2 2 6 2 2 6 2 2 6
43367- 2 2 6 2 2 6 2 2 6 2 2 6
43368- 2 2 6 2 2 6 2 2 6 2 2 6
43369- 2 2 6 2 2 6 2 2 6 2 2 6
43370- 2 2 6 2 2 6 2 2 6 54 54 54
43371- 66 66 66 26 26 26 6 6 6 0 0 0
43372- 0 0 0 0 0 0 0 0 0 0 0 0
43373- 0 0 0 0 0 0 0 0 0 0 0 0
43374- 0 0 0 0 0 0 0 0 0 0 0 0
43375- 0 0 0 0 0 0 0 0 0 0 0 0
43376- 0 0 0 0 0 0 0 0 0 0 0 0
43377- 0 0 0 0 0 0 0 0 0 0 0 0
43378- 0 0 0 0 0 0 0 0 0 0 0 0
43379- 0 0 0 0 0 1 0 0 1 0 0 0
43380- 0 0 0 0 0 0 0 0 0 0 0 0
43381- 0 0 0 0 0 0 0 0 0 0 0 0
43382- 0 0 0 0 0 0 0 0 0 0 0 0
43383- 0 0 0 0 0 0 0 0 0 0 0 0
43384- 0 0 0 0 0 0 0 0 0 14 14 14
43385- 42 42 42 82 82 82 2 2 6 2 2 6
43386- 2 2 6 6 6 6 10 10 10 2 2 6
43387- 2 2 6 2 2 6 2 2 6 2 2 6
43388- 2 2 6 2 2 6 2 2 6 6 6 6
43389- 14 14 14 10 10 10 2 2 6 2 2 6
43390- 2 2 6 2 2 6 2 2 6 18 18 18
43391- 82 82 82 34 34 34 10 10 10 0 0 0
43392- 0 0 0 0 0 0 0 0 0 0 0 0
43393- 0 0 0 0 0 0 0 0 0 0 0 0
43394- 0 0 0 0 0 0 0 0 0 0 0 0
43395- 0 0 0 0 0 0 0 0 0 0 0 0
43396- 0 0 0 0 0 0 0 0 0 0 0 0
43397- 0 0 0 0 0 0 0 0 0 0 0 0
43398- 0 0 0 0 0 0 0 0 0 0 0 0
43399- 0 0 1 0 0 0 0 0 0 0 0 0
43400- 0 0 0 0 0 0 0 0 0 0 0 0
43401- 0 0 0 0 0 0 0 0 0 0 0 0
43402- 0 0 0 0 0 0 0 0 0 0 0 0
43403- 0 0 0 0 0 0 0 0 0 0 0 0
43404- 0 0 0 0 0 0 0 0 0 14 14 14
43405- 46 46 46 86 86 86 2 2 6 2 2 6
43406- 6 6 6 6 6 6 22 22 22 34 34 34
43407- 6 6 6 2 2 6 2 2 6 2 2 6
43408- 2 2 6 2 2 6 18 18 18 34 34 34
43409- 10 10 10 50 50 50 22 22 22 2 2 6
43410- 2 2 6 2 2 6 2 2 6 10 10 10
43411- 86 86 86 42 42 42 14 14 14 0 0 0
43412- 0 0 0 0 0 0 0 0 0 0 0 0
43413- 0 0 0 0 0 0 0 0 0 0 0 0
43414- 0 0 0 0 0 0 0 0 0 0 0 0
43415- 0 0 0 0 0 0 0 0 0 0 0 0
43416- 0 0 0 0 0 0 0 0 0 0 0 0
43417- 0 0 0 0 0 0 0 0 0 0 0 0
43418- 0 0 0 0 0 0 0 0 0 0 0 0
43419- 0 0 1 0 0 1 0 0 1 0 0 0
43420- 0 0 0 0 0 0 0 0 0 0 0 0
43421- 0 0 0 0 0 0 0 0 0 0 0 0
43422- 0 0 0 0 0 0 0 0 0 0 0 0
43423- 0 0 0 0 0 0 0 0 0 0 0 0
43424- 0 0 0 0 0 0 0 0 0 14 14 14
43425- 46 46 46 86 86 86 2 2 6 2 2 6
43426- 38 38 38 116 116 116 94 94 94 22 22 22
43427- 22 22 22 2 2 6 2 2 6 2 2 6
43428- 14 14 14 86 86 86 138 138 138 162 162 162
43429-154 154 154 38 38 38 26 26 26 6 6 6
43430- 2 2 6 2 2 6 2 2 6 2 2 6
43431- 86 86 86 46 46 46 14 14 14 0 0 0
43432- 0 0 0 0 0 0 0 0 0 0 0 0
43433- 0 0 0 0 0 0 0 0 0 0 0 0
43434- 0 0 0 0 0 0 0 0 0 0 0 0
43435- 0 0 0 0 0 0 0 0 0 0 0 0
43436- 0 0 0 0 0 0 0 0 0 0 0 0
43437- 0 0 0 0 0 0 0 0 0 0 0 0
43438- 0 0 0 0 0 0 0 0 0 0 0 0
43439- 0 0 0 0 0 0 0 0 0 0 0 0
43440- 0 0 0 0 0 0 0 0 0 0 0 0
43441- 0 0 0 0 0 0 0 0 0 0 0 0
43442- 0 0 0 0 0 0 0 0 0 0 0 0
43443- 0 0 0 0 0 0 0 0 0 0 0 0
43444- 0 0 0 0 0 0 0 0 0 14 14 14
43445- 46 46 46 86 86 86 2 2 6 14 14 14
43446-134 134 134 198 198 198 195 195 195 116 116 116
43447- 10 10 10 2 2 6 2 2 6 6 6 6
43448-101 98 89 187 187 187 210 210 210 218 218 218
43449-214 214 214 134 134 134 14 14 14 6 6 6
43450- 2 2 6 2 2 6 2 2 6 2 2 6
43451- 86 86 86 50 50 50 18 18 18 6 6 6
43452- 0 0 0 0 0 0 0 0 0 0 0 0
43453- 0 0 0 0 0 0 0 0 0 0 0 0
43454- 0 0 0 0 0 0 0 0 0 0 0 0
43455- 0 0 0 0 0 0 0 0 0 0 0 0
43456- 0 0 0 0 0 0 0 0 0 0 0 0
43457- 0 0 0 0 0 0 0 0 0 0 0 0
43458- 0 0 0 0 0 0 0 0 1 0 0 0
43459- 0 0 1 0 0 1 0 0 1 0 0 0
43460- 0 0 0 0 0 0 0 0 0 0 0 0
43461- 0 0 0 0 0 0 0 0 0 0 0 0
43462- 0 0 0 0 0 0 0 0 0 0 0 0
43463- 0 0 0 0 0 0 0 0 0 0 0 0
43464- 0 0 0 0 0 0 0 0 0 14 14 14
43465- 46 46 46 86 86 86 2 2 6 54 54 54
43466-218 218 218 195 195 195 226 226 226 246 246 246
43467- 58 58 58 2 2 6 2 2 6 30 30 30
43468-210 210 210 253 253 253 174 174 174 123 123 123
43469-221 221 221 234 234 234 74 74 74 2 2 6
43470- 2 2 6 2 2 6 2 2 6 2 2 6
43471- 70 70 70 58 58 58 22 22 22 6 6 6
43472- 0 0 0 0 0 0 0 0 0 0 0 0
43473- 0 0 0 0 0 0 0 0 0 0 0 0
43474- 0 0 0 0 0 0 0 0 0 0 0 0
43475- 0 0 0 0 0 0 0 0 0 0 0 0
43476- 0 0 0 0 0 0 0 0 0 0 0 0
43477- 0 0 0 0 0 0 0 0 0 0 0 0
43478- 0 0 0 0 0 0 0 0 0 0 0 0
43479- 0 0 0 0 0 0 0 0 0 0 0 0
43480- 0 0 0 0 0 0 0 0 0 0 0 0
43481- 0 0 0 0 0 0 0 0 0 0 0 0
43482- 0 0 0 0 0 0 0 0 0 0 0 0
43483- 0 0 0 0 0 0 0 0 0 0 0 0
43484- 0 0 0 0 0 0 0 0 0 14 14 14
43485- 46 46 46 82 82 82 2 2 6 106 106 106
43486-170 170 170 26 26 26 86 86 86 226 226 226
43487-123 123 123 10 10 10 14 14 14 46 46 46
43488-231 231 231 190 190 190 6 6 6 70 70 70
43489- 90 90 90 238 238 238 158 158 158 2 2 6
43490- 2 2 6 2 2 6 2 2 6 2 2 6
43491- 70 70 70 58 58 58 22 22 22 6 6 6
43492- 0 0 0 0 0 0 0 0 0 0 0 0
43493- 0 0 0 0 0 0 0 0 0 0 0 0
43494- 0 0 0 0 0 0 0 0 0 0 0 0
43495- 0 0 0 0 0 0 0 0 0 0 0 0
43496- 0 0 0 0 0 0 0 0 0 0 0 0
43497- 0 0 0 0 0 0 0 0 0 0 0 0
43498- 0 0 0 0 0 0 0 0 1 0 0 0
43499- 0 0 1 0 0 1 0 0 1 0 0 0
43500- 0 0 0 0 0 0 0 0 0 0 0 0
43501- 0 0 0 0 0 0 0 0 0 0 0 0
43502- 0 0 0 0 0 0 0 0 0 0 0 0
43503- 0 0 0 0 0 0 0 0 0 0 0 0
43504- 0 0 0 0 0 0 0 0 0 14 14 14
43505- 42 42 42 86 86 86 6 6 6 116 116 116
43506-106 106 106 6 6 6 70 70 70 149 149 149
43507-128 128 128 18 18 18 38 38 38 54 54 54
43508-221 221 221 106 106 106 2 2 6 14 14 14
43509- 46 46 46 190 190 190 198 198 198 2 2 6
43510- 2 2 6 2 2 6 2 2 6 2 2 6
43511- 74 74 74 62 62 62 22 22 22 6 6 6
43512- 0 0 0 0 0 0 0 0 0 0 0 0
43513- 0 0 0 0 0 0 0 0 0 0 0 0
43514- 0 0 0 0 0 0 0 0 0 0 0 0
43515- 0 0 0 0 0 0 0 0 0 0 0 0
43516- 0 0 0 0 0 0 0 0 0 0 0 0
43517- 0 0 0 0 0 0 0 0 0 0 0 0
43518- 0 0 0 0 0 0 0 0 1 0 0 0
43519- 0 0 1 0 0 0 0 0 1 0 0 0
43520- 0 0 0 0 0 0 0 0 0 0 0 0
43521- 0 0 0 0 0 0 0 0 0 0 0 0
43522- 0 0 0 0 0 0 0 0 0 0 0 0
43523- 0 0 0 0 0 0 0 0 0 0 0 0
43524- 0 0 0 0 0 0 0 0 0 14 14 14
43525- 42 42 42 94 94 94 14 14 14 101 101 101
43526-128 128 128 2 2 6 18 18 18 116 116 116
43527-118 98 46 121 92 8 121 92 8 98 78 10
43528-162 162 162 106 106 106 2 2 6 2 2 6
43529- 2 2 6 195 195 195 195 195 195 6 6 6
43530- 2 2 6 2 2 6 2 2 6 2 2 6
43531- 74 74 74 62 62 62 22 22 22 6 6 6
43532- 0 0 0 0 0 0 0 0 0 0 0 0
43533- 0 0 0 0 0 0 0 0 0 0 0 0
43534- 0 0 0 0 0 0 0 0 0 0 0 0
43535- 0 0 0 0 0 0 0 0 0 0 0 0
43536- 0 0 0 0 0 0 0 0 0 0 0 0
43537- 0 0 0 0 0 0 0 0 0 0 0 0
43538- 0 0 0 0 0 0 0 0 1 0 0 1
43539- 0 0 1 0 0 0 0 0 1 0 0 0
43540- 0 0 0 0 0 0 0 0 0 0 0 0
43541- 0 0 0 0 0 0 0 0 0 0 0 0
43542- 0 0 0 0 0 0 0 0 0 0 0 0
43543- 0 0 0 0 0 0 0 0 0 0 0 0
43544- 0 0 0 0 0 0 0 0 0 10 10 10
43545- 38 38 38 90 90 90 14 14 14 58 58 58
43546-210 210 210 26 26 26 54 38 6 154 114 10
43547-226 170 11 236 186 11 225 175 15 184 144 12
43548-215 174 15 175 146 61 37 26 9 2 2 6
43549- 70 70 70 246 246 246 138 138 138 2 2 6
43550- 2 2 6 2 2 6 2 2 6 2 2 6
43551- 70 70 70 66 66 66 26 26 26 6 6 6
43552- 0 0 0 0 0 0 0 0 0 0 0 0
43553- 0 0 0 0 0 0 0 0 0 0 0 0
43554- 0 0 0 0 0 0 0 0 0 0 0 0
43555- 0 0 0 0 0 0 0 0 0 0 0 0
43556- 0 0 0 0 0 0 0 0 0 0 0 0
43557- 0 0 0 0 0 0 0 0 0 0 0 0
43558- 0 0 0 0 0 0 0 0 0 0 0 0
43559- 0 0 0 0 0 0 0 0 0 0 0 0
43560- 0 0 0 0 0 0 0 0 0 0 0 0
43561- 0 0 0 0 0 0 0 0 0 0 0 0
43562- 0 0 0 0 0 0 0 0 0 0 0 0
43563- 0 0 0 0 0 0 0 0 0 0 0 0
43564- 0 0 0 0 0 0 0 0 0 10 10 10
43565- 38 38 38 86 86 86 14 14 14 10 10 10
43566-195 195 195 188 164 115 192 133 9 225 175 15
43567-239 182 13 234 190 10 232 195 16 232 200 30
43568-245 207 45 241 208 19 232 195 16 184 144 12
43569-218 194 134 211 206 186 42 42 42 2 2 6
43570- 2 2 6 2 2 6 2 2 6 2 2 6
43571- 50 50 50 74 74 74 30 30 30 6 6 6
43572- 0 0 0 0 0 0 0 0 0 0 0 0
43573- 0 0 0 0 0 0 0 0 0 0 0 0
43574- 0 0 0 0 0 0 0 0 0 0 0 0
43575- 0 0 0 0 0 0 0 0 0 0 0 0
43576- 0 0 0 0 0 0 0 0 0 0 0 0
43577- 0 0 0 0 0 0 0 0 0 0 0 0
43578- 0 0 0 0 0 0 0 0 0 0 0 0
43579- 0 0 0 0 0 0 0 0 0 0 0 0
43580- 0 0 0 0 0 0 0 0 0 0 0 0
43581- 0 0 0 0 0 0 0 0 0 0 0 0
43582- 0 0 0 0 0 0 0 0 0 0 0 0
43583- 0 0 0 0 0 0 0 0 0 0 0 0
43584- 0 0 0 0 0 0 0 0 0 10 10 10
43585- 34 34 34 86 86 86 14 14 14 2 2 6
43586-121 87 25 192 133 9 219 162 10 239 182 13
43587-236 186 11 232 195 16 241 208 19 244 214 54
43588-246 218 60 246 218 38 246 215 20 241 208 19
43589-241 208 19 226 184 13 121 87 25 2 2 6
43590- 2 2 6 2 2 6 2 2 6 2 2 6
43591- 50 50 50 82 82 82 34 34 34 10 10 10
43592- 0 0 0 0 0 0 0 0 0 0 0 0
43593- 0 0 0 0 0 0 0 0 0 0 0 0
43594- 0 0 0 0 0 0 0 0 0 0 0 0
43595- 0 0 0 0 0 0 0 0 0 0 0 0
43596- 0 0 0 0 0 0 0 0 0 0 0 0
43597- 0 0 0 0 0 0 0 0 0 0 0 0
43598- 0 0 0 0 0 0 0 0 0 0 0 0
43599- 0 0 0 0 0 0 0 0 0 0 0 0
43600- 0 0 0 0 0 0 0 0 0 0 0 0
43601- 0 0 0 0 0 0 0 0 0 0 0 0
43602- 0 0 0 0 0 0 0 0 0 0 0 0
43603- 0 0 0 0 0 0 0 0 0 0 0 0
43604- 0 0 0 0 0 0 0 0 0 10 10 10
43605- 34 34 34 82 82 82 30 30 30 61 42 6
43606-180 123 7 206 145 10 230 174 11 239 182 13
43607-234 190 10 238 202 15 241 208 19 246 218 74
43608-246 218 38 246 215 20 246 215 20 246 215 20
43609-226 184 13 215 174 15 184 144 12 6 6 6
43610- 2 2 6 2 2 6 2 2 6 2 2 6
43611- 26 26 26 94 94 94 42 42 42 14 14 14
43612- 0 0 0 0 0 0 0 0 0 0 0 0
43613- 0 0 0 0 0 0 0 0 0 0 0 0
43614- 0 0 0 0 0 0 0 0 0 0 0 0
43615- 0 0 0 0 0 0 0 0 0 0 0 0
43616- 0 0 0 0 0 0 0 0 0 0 0 0
43617- 0 0 0 0 0 0 0 0 0 0 0 0
43618- 0 0 0 0 0 0 0 0 0 0 0 0
43619- 0 0 0 0 0 0 0 0 0 0 0 0
43620- 0 0 0 0 0 0 0 0 0 0 0 0
43621- 0 0 0 0 0 0 0 0 0 0 0 0
43622- 0 0 0 0 0 0 0 0 0 0 0 0
43623- 0 0 0 0 0 0 0 0 0 0 0 0
43624- 0 0 0 0 0 0 0 0 0 10 10 10
43625- 30 30 30 78 78 78 50 50 50 104 69 6
43626-192 133 9 216 158 10 236 178 12 236 186 11
43627-232 195 16 241 208 19 244 214 54 245 215 43
43628-246 215 20 246 215 20 241 208 19 198 155 10
43629-200 144 11 216 158 10 156 118 10 2 2 6
43630- 2 2 6 2 2 6 2 2 6 2 2 6
43631- 6 6 6 90 90 90 54 54 54 18 18 18
43632- 6 6 6 0 0 0 0 0 0 0 0 0
43633- 0 0 0 0 0 0 0 0 0 0 0 0
43634- 0 0 0 0 0 0 0 0 0 0 0 0
43635- 0 0 0 0 0 0 0 0 0 0 0 0
43636- 0 0 0 0 0 0 0 0 0 0 0 0
43637- 0 0 0 0 0 0 0 0 0 0 0 0
43638- 0 0 0 0 0 0 0 0 0 0 0 0
43639- 0 0 0 0 0 0 0 0 0 0 0 0
43640- 0 0 0 0 0 0 0 0 0 0 0 0
43641- 0 0 0 0 0 0 0 0 0 0 0 0
43642- 0 0 0 0 0 0 0 0 0 0 0 0
43643- 0 0 0 0 0 0 0 0 0 0 0 0
43644- 0 0 0 0 0 0 0 0 0 10 10 10
43645- 30 30 30 78 78 78 46 46 46 22 22 22
43646-137 92 6 210 162 10 239 182 13 238 190 10
43647-238 202 15 241 208 19 246 215 20 246 215 20
43648-241 208 19 203 166 17 185 133 11 210 150 10
43649-216 158 10 210 150 10 102 78 10 2 2 6
43650- 6 6 6 54 54 54 14 14 14 2 2 6
43651- 2 2 6 62 62 62 74 74 74 30 30 30
43652- 10 10 10 0 0 0 0 0 0 0 0 0
43653- 0 0 0 0 0 0 0 0 0 0 0 0
43654- 0 0 0 0 0 0 0 0 0 0 0 0
43655- 0 0 0 0 0 0 0 0 0 0 0 0
43656- 0 0 0 0 0 0 0 0 0 0 0 0
43657- 0 0 0 0 0 0 0 0 0 0 0 0
43658- 0 0 0 0 0 0 0 0 0 0 0 0
43659- 0 0 0 0 0 0 0 0 0 0 0 0
43660- 0 0 0 0 0 0 0 0 0 0 0 0
43661- 0 0 0 0 0 0 0 0 0 0 0 0
43662- 0 0 0 0 0 0 0 0 0 0 0 0
43663- 0 0 0 0 0 0 0 0 0 0 0 0
43664- 0 0 0 0 0 0 0 0 0 10 10 10
43665- 34 34 34 78 78 78 50 50 50 6 6 6
43666- 94 70 30 139 102 15 190 146 13 226 184 13
43667-232 200 30 232 195 16 215 174 15 190 146 13
43668-168 122 10 192 133 9 210 150 10 213 154 11
43669-202 150 34 182 157 106 101 98 89 2 2 6
43670- 2 2 6 78 78 78 116 116 116 58 58 58
43671- 2 2 6 22 22 22 90 90 90 46 46 46
43672- 18 18 18 6 6 6 0 0 0 0 0 0
43673- 0 0 0 0 0 0 0 0 0 0 0 0
43674- 0 0 0 0 0 0 0 0 0 0 0 0
43675- 0 0 0 0 0 0 0 0 0 0 0 0
43676- 0 0 0 0 0 0 0 0 0 0 0 0
43677- 0 0 0 0 0 0 0 0 0 0 0 0
43678- 0 0 0 0 0 0 0 0 0 0 0 0
43679- 0 0 0 0 0 0 0 0 0 0 0 0
43680- 0 0 0 0 0 0 0 0 0 0 0 0
43681- 0 0 0 0 0 0 0 0 0 0 0 0
43682- 0 0 0 0 0 0 0 0 0 0 0 0
43683- 0 0 0 0 0 0 0 0 0 0 0 0
43684- 0 0 0 0 0 0 0 0 0 10 10 10
43685- 38 38 38 86 86 86 50 50 50 6 6 6
43686-128 128 128 174 154 114 156 107 11 168 122 10
43687-198 155 10 184 144 12 197 138 11 200 144 11
43688-206 145 10 206 145 10 197 138 11 188 164 115
43689-195 195 195 198 198 198 174 174 174 14 14 14
43690- 2 2 6 22 22 22 116 116 116 116 116 116
43691- 22 22 22 2 2 6 74 74 74 70 70 70
43692- 30 30 30 10 10 10 0 0 0 0 0 0
43693- 0 0 0 0 0 0 0 0 0 0 0 0
43694- 0 0 0 0 0 0 0 0 0 0 0 0
43695- 0 0 0 0 0 0 0 0 0 0 0 0
43696- 0 0 0 0 0 0 0 0 0 0 0 0
43697- 0 0 0 0 0 0 0 0 0 0 0 0
43698- 0 0 0 0 0 0 0 0 0 0 0 0
43699- 0 0 0 0 0 0 0 0 0 0 0 0
43700- 0 0 0 0 0 0 0 0 0 0 0 0
43701- 0 0 0 0 0 0 0 0 0 0 0 0
43702- 0 0 0 0 0 0 0 0 0 0 0 0
43703- 0 0 0 0 0 0 0 0 0 0 0 0
43704- 0 0 0 0 0 0 6 6 6 18 18 18
43705- 50 50 50 101 101 101 26 26 26 10 10 10
43706-138 138 138 190 190 190 174 154 114 156 107 11
43707-197 138 11 200 144 11 197 138 11 192 133 9
43708-180 123 7 190 142 34 190 178 144 187 187 187
43709-202 202 202 221 221 221 214 214 214 66 66 66
43710- 2 2 6 2 2 6 50 50 50 62 62 62
43711- 6 6 6 2 2 6 10 10 10 90 90 90
43712- 50 50 50 18 18 18 6 6 6 0 0 0
43713- 0 0 0 0 0 0 0 0 0 0 0 0
43714- 0 0 0 0 0 0 0 0 0 0 0 0
43715- 0 0 0 0 0 0 0 0 0 0 0 0
43716- 0 0 0 0 0 0 0 0 0 0 0 0
43717- 0 0 0 0 0 0 0 0 0 0 0 0
43718- 0 0 0 0 0 0 0 0 0 0 0 0
43719- 0 0 0 0 0 0 0 0 0 0 0 0
43720- 0 0 0 0 0 0 0 0 0 0 0 0
43721- 0 0 0 0 0 0 0 0 0 0 0 0
43722- 0 0 0 0 0 0 0 0 0 0 0 0
43723- 0 0 0 0 0 0 0 0 0 0 0 0
43724- 0 0 0 0 0 0 10 10 10 34 34 34
43725- 74 74 74 74 74 74 2 2 6 6 6 6
43726-144 144 144 198 198 198 190 190 190 178 166 146
43727-154 121 60 156 107 11 156 107 11 168 124 44
43728-174 154 114 187 187 187 190 190 190 210 210 210
43729-246 246 246 253 253 253 253 253 253 182 182 182
43730- 6 6 6 2 2 6 2 2 6 2 2 6
43731- 2 2 6 2 2 6 2 2 6 62 62 62
43732- 74 74 74 34 34 34 14 14 14 0 0 0
43733- 0 0 0 0 0 0 0 0 0 0 0 0
43734- 0 0 0 0 0 0 0 0 0 0 0 0
43735- 0 0 0 0 0 0 0 0 0 0 0 0
43736- 0 0 0 0 0 0 0 0 0 0 0 0
43737- 0 0 0 0 0 0 0 0 0 0 0 0
43738- 0 0 0 0 0 0 0 0 0 0 0 0
43739- 0 0 0 0 0 0 0 0 0 0 0 0
43740- 0 0 0 0 0 0 0 0 0 0 0 0
43741- 0 0 0 0 0 0 0 0 0 0 0 0
43742- 0 0 0 0 0 0 0 0 0 0 0 0
43743- 0 0 0 0 0 0 0 0 0 0 0 0
43744- 0 0 0 10 10 10 22 22 22 54 54 54
43745- 94 94 94 18 18 18 2 2 6 46 46 46
43746-234 234 234 221 221 221 190 190 190 190 190 190
43747-190 190 190 187 187 187 187 187 187 190 190 190
43748-190 190 190 195 195 195 214 214 214 242 242 242
43749-253 253 253 253 253 253 253 253 253 253 253 253
43750- 82 82 82 2 2 6 2 2 6 2 2 6
43751- 2 2 6 2 2 6 2 2 6 14 14 14
43752- 86 86 86 54 54 54 22 22 22 6 6 6
43753- 0 0 0 0 0 0 0 0 0 0 0 0
43754- 0 0 0 0 0 0 0 0 0 0 0 0
43755- 0 0 0 0 0 0 0 0 0 0 0 0
43756- 0 0 0 0 0 0 0 0 0 0 0 0
43757- 0 0 0 0 0 0 0 0 0 0 0 0
43758- 0 0 0 0 0 0 0 0 0 0 0 0
43759- 0 0 0 0 0 0 0 0 0 0 0 0
43760- 0 0 0 0 0 0 0 0 0 0 0 0
43761- 0 0 0 0 0 0 0 0 0 0 0 0
43762- 0 0 0 0 0 0 0 0 0 0 0 0
43763- 0 0 0 0 0 0 0 0 0 0 0 0
43764- 6 6 6 18 18 18 46 46 46 90 90 90
43765- 46 46 46 18 18 18 6 6 6 182 182 182
43766-253 253 253 246 246 246 206 206 206 190 190 190
43767-190 190 190 190 190 190 190 190 190 190 190 190
43768-206 206 206 231 231 231 250 250 250 253 253 253
43769-253 253 253 253 253 253 253 253 253 253 253 253
43770-202 202 202 14 14 14 2 2 6 2 2 6
43771- 2 2 6 2 2 6 2 2 6 2 2 6
43772- 42 42 42 86 86 86 42 42 42 18 18 18
43773- 6 6 6 0 0 0 0 0 0 0 0 0
43774- 0 0 0 0 0 0 0 0 0 0 0 0
43775- 0 0 0 0 0 0 0 0 0 0 0 0
43776- 0 0 0 0 0 0 0 0 0 0 0 0
43777- 0 0 0 0 0 0 0 0 0 0 0 0
43778- 0 0 0 0 0 0 0 0 0 0 0 0
43779- 0 0 0 0 0 0 0 0 0 0 0 0
43780- 0 0 0 0 0 0 0 0 0 0 0 0
43781- 0 0 0 0 0 0 0 0 0 0 0 0
43782- 0 0 0 0 0 0 0 0 0 0 0 0
43783- 0 0 0 0 0 0 0 0 0 6 6 6
43784- 14 14 14 38 38 38 74 74 74 66 66 66
43785- 2 2 6 6 6 6 90 90 90 250 250 250
43786-253 253 253 253 253 253 238 238 238 198 198 198
43787-190 190 190 190 190 190 195 195 195 221 221 221
43788-246 246 246 253 253 253 253 253 253 253 253 253
43789-253 253 253 253 253 253 253 253 253 253 253 253
43790-253 253 253 82 82 82 2 2 6 2 2 6
43791- 2 2 6 2 2 6 2 2 6 2 2 6
43792- 2 2 6 78 78 78 70 70 70 34 34 34
43793- 14 14 14 6 6 6 0 0 0 0 0 0
43794- 0 0 0 0 0 0 0 0 0 0 0 0
43795- 0 0 0 0 0 0 0 0 0 0 0 0
43796- 0 0 0 0 0 0 0 0 0 0 0 0
43797- 0 0 0 0 0 0 0 0 0 0 0 0
43798- 0 0 0 0 0 0 0 0 0 0 0 0
43799- 0 0 0 0 0 0 0 0 0 0 0 0
43800- 0 0 0 0 0 0 0 0 0 0 0 0
43801- 0 0 0 0 0 0 0 0 0 0 0 0
43802- 0 0 0 0 0 0 0 0 0 0 0 0
43803- 0 0 0 0 0 0 0 0 0 14 14 14
43804- 34 34 34 66 66 66 78 78 78 6 6 6
43805- 2 2 6 18 18 18 218 218 218 253 253 253
43806-253 253 253 253 253 253 253 253 253 246 246 246
43807-226 226 226 231 231 231 246 246 246 253 253 253
43808-253 253 253 253 253 253 253 253 253 253 253 253
43809-253 253 253 253 253 253 253 253 253 253 253 253
43810-253 253 253 178 178 178 2 2 6 2 2 6
43811- 2 2 6 2 2 6 2 2 6 2 2 6
43812- 2 2 6 18 18 18 90 90 90 62 62 62
43813- 30 30 30 10 10 10 0 0 0 0 0 0
43814- 0 0 0 0 0 0 0 0 0 0 0 0
43815- 0 0 0 0 0 0 0 0 0 0 0 0
43816- 0 0 0 0 0 0 0 0 0 0 0 0
43817- 0 0 0 0 0 0 0 0 0 0 0 0
43818- 0 0 0 0 0 0 0 0 0 0 0 0
43819- 0 0 0 0 0 0 0 0 0 0 0 0
43820- 0 0 0 0 0 0 0 0 0 0 0 0
43821- 0 0 0 0 0 0 0 0 0 0 0 0
43822- 0 0 0 0 0 0 0 0 0 0 0 0
43823- 0 0 0 0 0 0 10 10 10 26 26 26
43824- 58 58 58 90 90 90 18 18 18 2 2 6
43825- 2 2 6 110 110 110 253 253 253 253 253 253
43826-253 253 253 253 253 253 253 253 253 253 253 253
43827-250 250 250 253 253 253 253 253 253 253 253 253
43828-253 253 253 253 253 253 253 253 253 253 253 253
43829-253 253 253 253 253 253 253 253 253 253 253 253
43830-253 253 253 231 231 231 18 18 18 2 2 6
43831- 2 2 6 2 2 6 2 2 6 2 2 6
43832- 2 2 6 2 2 6 18 18 18 94 94 94
43833- 54 54 54 26 26 26 10 10 10 0 0 0
43834- 0 0 0 0 0 0 0 0 0 0 0 0
43835- 0 0 0 0 0 0 0 0 0 0 0 0
43836- 0 0 0 0 0 0 0 0 0 0 0 0
43837- 0 0 0 0 0 0 0 0 0 0 0 0
43838- 0 0 0 0 0 0 0 0 0 0 0 0
43839- 0 0 0 0 0 0 0 0 0 0 0 0
43840- 0 0 0 0 0 0 0 0 0 0 0 0
43841- 0 0 0 0 0 0 0 0 0 0 0 0
43842- 0 0 0 0 0 0 0 0 0 0 0 0
43843- 0 0 0 6 6 6 22 22 22 50 50 50
43844- 90 90 90 26 26 26 2 2 6 2 2 6
43845- 14 14 14 195 195 195 250 250 250 253 253 253
43846-253 253 253 253 253 253 253 253 253 253 253 253
43847-253 253 253 253 253 253 253 253 253 253 253 253
43848-253 253 253 253 253 253 253 253 253 253 253 253
43849-253 253 253 253 253 253 253 253 253 253 253 253
43850-250 250 250 242 242 242 54 54 54 2 2 6
43851- 2 2 6 2 2 6 2 2 6 2 2 6
43852- 2 2 6 2 2 6 2 2 6 38 38 38
43853- 86 86 86 50 50 50 22 22 22 6 6 6
43854- 0 0 0 0 0 0 0 0 0 0 0 0
43855- 0 0 0 0 0 0 0 0 0 0 0 0
43856- 0 0 0 0 0 0 0 0 0 0 0 0
43857- 0 0 0 0 0 0 0 0 0 0 0 0
43858- 0 0 0 0 0 0 0 0 0 0 0 0
43859- 0 0 0 0 0 0 0 0 0 0 0 0
43860- 0 0 0 0 0 0 0 0 0 0 0 0
43861- 0 0 0 0 0 0 0 0 0 0 0 0
43862- 0 0 0 0 0 0 0 0 0 0 0 0
43863- 6 6 6 14 14 14 38 38 38 82 82 82
43864- 34 34 34 2 2 6 2 2 6 2 2 6
43865- 42 42 42 195 195 195 246 246 246 253 253 253
43866-253 253 253 253 253 253 253 253 253 250 250 250
43867-242 242 242 242 242 242 250 250 250 253 253 253
43868-253 253 253 253 253 253 253 253 253 253 253 253
43869-253 253 253 250 250 250 246 246 246 238 238 238
43870-226 226 226 231 231 231 101 101 101 6 6 6
43871- 2 2 6 2 2 6 2 2 6 2 2 6
43872- 2 2 6 2 2 6 2 2 6 2 2 6
43873- 38 38 38 82 82 82 42 42 42 14 14 14
43874- 6 6 6 0 0 0 0 0 0 0 0 0
43875- 0 0 0 0 0 0 0 0 0 0 0 0
43876- 0 0 0 0 0 0 0 0 0 0 0 0
43877- 0 0 0 0 0 0 0 0 0 0 0 0
43878- 0 0 0 0 0 0 0 0 0 0 0 0
43879- 0 0 0 0 0 0 0 0 0 0 0 0
43880- 0 0 0 0 0 0 0 0 0 0 0 0
43881- 0 0 0 0 0 0 0 0 0 0 0 0
43882- 0 0 0 0 0 0 0 0 0 0 0 0
43883- 10 10 10 26 26 26 62 62 62 66 66 66
43884- 2 2 6 2 2 6 2 2 6 6 6 6
43885- 70 70 70 170 170 170 206 206 206 234 234 234
43886-246 246 246 250 250 250 250 250 250 238 238 238
43887-226 226 226 231 231 231 238 238 238 250 250 250
43888-250 250 250 250 250 250 246 246 246 231 231 231
43889-214 214 214 206 206 206 202 202 202 202 202 202
43890-198 198 198 202 202 202 182 182 182 18 18 18
43891- 2 2 6 2 2 6 2 2 6 2 2 6
43892- 2 2 6 2 2 6 2 2 6 2 2 6
43893- 2 2 6 62 62 62 66 66 66 30 30 30
43894- 10 10 10 0 0 0 0 0 0 0 0 0
43895- 0 0 0 0 0 0 0 0 0 0 0 0
43896- 0 0 0 0 0 0 0 0 0 0 0 0
43897- 0 0 0 0 0 0 0 0 0 0 0 0
43898- 0 0 0 0 0 0 0 0 0 0 0 0
43899- 0 0 0 0 0 0 0 0 0 0 0 0
43900- 0 0 0 0 0 0 0 0 0 0 0 0
43901- 0 0 0 0 0 0 0 0 0 0 0 0
43902- 0 0 0 0 0 0 0 0 0 0 0 0
43903- 14 14 14 42 42 42 82 82 82 18 18 18
43904- 2 2 6 2 2 6 2 2 6 10 10 10
43905- 94 94 94 182 182 182 218 218 218 242 242 242
43906-250 250 250 253 253 253 253 253 253 250 250 250
43907-234 234 234 253 253 253 253 253 253 253 253 253
43908-253 253 253 253 253 253 253 253 253 246 246 246
43909-238 238 238 226 226 226 210 210 210 202 202 202
43910-195 195 195 195 195 195 210 210 210 158 158 158
43911- 6 6 6 14 14 14 50 50 50 14 14 14
43912- 2 2 6 2 2 6 2 2 6 2 2 6
43913- 2 2 6 6 6 6 86 86 86 46 46 46
43914- 18 18 18 6 6 6 0 0 0 0 0 0
43915- 0 0 0 0 0 0 0 0 0 0 0 0
43916- 0 0 0 0 0 0 0 0 0 0 0 0
43917- 0 0 0 0 0 0 0 0 0 0 0 0
43918- 0 0 0 0 0 0 0 0 0 0 0 0
43919- 0 0 0 0 0 0 0 0 0 0 0 0
43920- 0 0 0 0 0 0 0 0 0 0 0 0
43921- 0 0 0 0 0 0 0 0 0 0 0 0
43922- 0 0 0 0 0 0 0 0 0 6 6 6
43923- 22 22 22 54 54 54 70 70 70 2 2 6
43924- 2 2 6 10 10 10 2 2 6 22 22 22
43925-166 166 166 231 231 231 250 250 250 253 253 253
43926-253 253 253 253 253 253 253 253 253 250 250 250
43927-242 242 242 253 253 253 253 253 253 253 253 253
43928-253 253 253 253 253 253 253 253 253 253 253 253
43929-253 253 253 253 253 253 253 253 253 246 246 246
43930-231 231 231 206 206 206 198 198 198 226 226 226
43931- 94 94 94 2 2 6 6 6 6 38 38 38
43932- 30 30 30 2 2 6 2 2 6 2 2 6
43933- 2 2 6 2 2 6 62 62 62 66 66 66
43934- 26 26 26 10 10 10 0 0 0 0 0 0
43935- 0 0 0 0 0 0 0 0 0 0 0 0
43936- 0 0 0 0 0 0 0 0 0 0 0 0
43937- 0 0 0 0 0 0 0 0 0 0 0 0
43938- 0 0 0 0 0 0 0 0 0 0 0 0
43939- 0 0 0 0 0 0 0 0 0 0 0 0
43940- 0 0 0 0 0 0 0 0 0 0 0 0
43941- 0 0 0 0 0 0 0 0 0 0 0 0
43942- 0 0 0 0 0 0 0 0 0 10 10 10
43943- 30 30 30 74 74 74 50 50 50 2 2 6
43944- 26 26 26 26 26 26 2 2 6 106 106 106
43945-238 238 238 253 253 253 253 253 253 253 253 253
43946-253 253 253 253 253 253 253 253 253 253 253 253
43947-253 253 253 253 253 253 253 253 253 253 253 253
43948-253 253 253 253 253 253 253 253 253 253 253 253
43949-253 253 253 253 253 253 253 253 253 253 253 253
43950-253 253 253 246 246 246 218 218 218 202 202 202
43951-210 210 210 14 14 14 2 2 6 2 2 6
43952- 30 30 30 22 22 22 2 2 6 2 2 6
43953- 2 2 6 2 2 6 18 18 18 86 86 86
43954- 42 42 42 14 14 14 0 0 0 0 0 0
43955- 0 0 0 0 0 0 0 0 0 0 0 0
43956- 0 0 0 0 0 0 0 0 0 0 0 0
43957- 0 0 0 0 0 0 0 0 0 0 0 0
43958- 0 0 0 0 0 0 0 0 0 0 0 0
43959- 0 0 0 0 0 0 0 0 0 0 0 0
43960- 0 0 0 0 0 0 0 0 0 0 0 0
43961- 0 0 0 0 0 0 0 0 0 0 0 0
43962- 0 0 0 0 0 0 0 0 0 14 14 14
43963- 42 42 42 90 90 90 22 22 22 2 2 6
43964- 42 42 42 2 2 6 18 18 18 218 218 218
43965-253 253 253 253 253 253 253 253 253 253 253 253
43966-253 253 253 253 253 253 253 253 253 253 253 253
43967-253 253 253 253 253 253 253 253 253 253 253 253
43968-253 253 253 253 253 253 253 253 253 253 253 253
43969-253 253 253 253 253 253 253 253 253 253 253 253
43970-253 253 253 253 253 253 250 250 250 221 221 221
43971-218 218 218 101 101 101 2 2 6 14 14 14
43972- 18 18 18 38 38 38 10 10 10 2 2 6
43973- 2 2 6 2 2 6 2 2 6 78 78 78
43974- 58 58 58 22 22 22 6 6 6 0 0 0
43975- 0 0 0 0 0 0 0 0 0 0 0 0
43976- 0 0 0 0 0 0 0 0 0 0 0 0
43977- 0 0 0 0 0 0 0 0 0 0 0 0
43978- 0 0 0 0 0 0 0 0 0 0 0 0
43979- 0 0 0 0 0 0 0 0 0 0 0 0
43980- 0 0 0 0 0 0 0 0 0 0 0 0
43981- 0 0 0 0 0 0 0 0 0 0 0 0
43982- 0 0 0 0 0 0 6 6 6 18 18 18
43983- 54 54 54 82 82 82 2 2 6 26 26 26
43984- 22 22 22 2 2 6 123 123 123 253 253 253
43985-253 253 253 253 253 253 253 253 253 253 253 253
43986-253 253 253 253 253 253 253 253 253 253 253 253
43987-253 253 253 253 253 253 253 253 253 253 253 253
43988-253 253 253 253 253 253 253 253 253 253 253 253
43989-253 253 253 253 253 253 253 253 253 253 253 253
43990-253 253 253 253 253 253 253 253 253 250 250 250
43991-238 238 238 198 198 198 6 6 6 38 38 38
43992- 58 58 58 26 26 26 38 38 38 2 2 6
43993- 2 2 6 2 2 6 2 2 6 46 46 46
43994- 78 78 78 30 30 30 10 10 10 0 0 0
43995- 0 0 0 0 0 0 0 0 0 0 0 0
43996- 0 0 0 0 0 0 0 0 0 0 0 0
43997- 0 0 0 0 0 0 0 0 0 0 0 0
43998- 0 0 0 0 0 0 0 0 0 0 0 0
43999- 0 0 0 0 0 0 0 0 0 0 0 0
44000- 0 0 0 0 0 0 0 0 0 0 0 0
44001- 0 0 0 0 0 0 0 0 0 0 0 0
44002- 0 0 0 0 0 0 10 10 10 30 30 30
44003- 74 74 74 58 58 58 2 2 6 42 42 42
44004- 2 2 6 22 22 22 231 231 231 253 253 253
44005-253 253 253 253 253 253 253 253 253 253 253 253
44006-253 253 253 253 253 253 253 253 253 250 250 250
44007-253 253 253 253 253 253 253 253 253 253 253 253
44008-253 253 253 253 253 253 253 253 253 253 253 253
44009-253 253 253 253 253 253 253 253 253 253 253 253
44010-253 253 253 253 253 253 253 253 253 253 253 253
44011-253 253 253 246 246 246 46 46 46 38 38 38
44012- 42 42 42 14 14 14 38 38 38 14 14 14
44013- 2 2 6 2 2 6 2 2 6 6 6 6
44014- 86 86 86 46 46 46 14 14 14 0 0 0
44015- 0 0 0 0 0 0 0 0 0 0 0 0
44016- 0 0 0 0 0 0 0 0 0 0 0 0
44017- 0 0 0 0 0 0 0 0 0 0 0 0
44018- 0 0 0 0 0 0 0 0 0 0 0 0
44019- 0 0 0 0 0 0 0 0 0 0 0 0
44020- 0 0 0 0 0 0 0 0 0 0 0 0
44021- 0 0 0 0 0 0 0 0 0 0 0 0
44022- 0 0 0 6 6 6 14 14 14 42 42 42
44023- 90 90 90 18 18 18 18 18 18 26 26 26
44024- 2 2 6 116 116 116 253 253 253 253 253 253
44025-253 253 253 253 253 253 253 253 253 253 253 253
44026-253 253 253 253 253 253 250 250 250 238 238 238
44027-253 253 253 253 253 253 253 253 253 253 253 253
44028-253 253 253 253 253 253 253 253 253 253 253 253
44029-253 253 253 253 253 253 253 253 253 253 253 253
44030-253 253 253 253 253 253 253 253 253 253 253 253
44031-253 253 253 253 253 253 94 94 94 6 6 6
44032- 2 2 6 2 2 6 10 10 10 34 34 34
44033- 2 2 6 2 2 6 2 2 6 2 2 6
44034- 74 74 74 58 58 58 22 22 22 6 6 6
44035- 0 0 0 0 0 0 0 0 0 0 0 0
44036- 0 0 0 0 0 0 0 0 0 0 0 0
44037- 0 0 0 0 0 0 0 0 0 0 0 0
44038- 0 0 0 0 0 0 0 0 0 0 0 0
44039- 0 0 0 0 0 0 0 0 0 0 0 0
44040- 0 0 0 0 0 0 0 0 0 0 0 0
44041- 0 0 0 0 0 0 0 0 0 0 0 0
44042- 0 0 0 10 10 10 26 26 26 66 66 66
44043- 82 82 82 2 2 6 38 38 38 6 6 6
44044- 14 14 14 210 210 210 253 253 253 253 253 253
44045-253 253 253 253 253 253 253 253 253 253 253 253
44046-253 253 253 253 253 253 246 246 246 242 242 242
44047-253 253 253 253 253 253 253 253 253 253 253 253
44048-253 253 253 253 253 253 253 253 253 253 253 253
44049-253 253 253 253 253 253 253 253 253 253 253 253
44050-253 253 253 253 253 253 253 253 253 253 253 253
44051-253 253 253 253 253 253 144 144 144 2 2 6
44052- 2 2 6 2 2 6 2 2 6 46 46 46
44053- 2 2 6 2 2 6 2 2 6 2 2 6
44054- 42 42 42 74 74 74 30 30 30 10 10 10
44055- 0 0 0 0 0 0 0 0 0 0 0 0
44056- 0 0 0 0 0 0 0 0 0 0 0 0
44057- 0 0 0 0 0 0 0 0 0 0 0 0
44058- 0 0 0 0 0 0 0 0 0 0 0 0
44059- 0 0 0 0 0 0 0 0 0 0 0 0
44060- 0 0 0 0 0 0 0 0 0 0 0 0
44061- 0 0 0 0 0 0 0 0 0 0 0 0
44062- 6 6 6 14 14 14 42 42 42 90 90 90
44063- 26 26 26 6 6 6 42 42 42 2 2 6
44064- 74 74 74 250 250 250 253 253 253 253 253 253
44065-253 253 253 253 253 253 253 253 253 253 253 253
44066-253 253 253 253 253 253 242 242 242 242 242 242
44067-253 253 253 253 253 253 253 253 253 253 253 253
44068-253 253 253 253 253 253 253 253 253 253 253 253
44069-253 253 253 253 253 253 253 253 253 253 253 253
44070-253 253 253 253 253 253 253 253 253 253 253 253
44071-253 253 253 253 253 253 182 182 182 2 2 6
44072- 2 2 6 2 2 6 2 2 6 46 46 46
44073- 2 2 6 2 2 6 2 2 6 2 2 6
44074- 10 10 10 86 86 86 38 38 38 10 10 10
44075- 0 0 0 0 0 0 0 0 0 0 0 0
44076- 0 0 0 0 0 0 0 0 0 0 0 0
44077- 0 0 0 0 0 0 0 0 0 0 0 0
44078- 0 0 0 0 0 0 0 0 0 0 0 0
44079- 0 0 0 0 0 0 0 0 0 0 0 0
44080- 0 0 0 0 0 0 0 0 0 0 0 0
44081- 0 0 0 0 0 0 0 0 0 0 0 0
44082- 10 10 10 26 26 26 66 66 66 82 82 82
44083- 2 2 6 22 22 22 18 18 18 2 2 6
44084-149 149 149 253 253 253 253 253 253 253 253 253
44085-253 253 253 253 253 253 253 253 253 253 253 253
44086-253 253 253 253 253 253 234 234 234 242 242 242
44087-253 253 253 253 253 253 253 253 253 253 253 253
44088-253 253 253 253 253 253 253 253 253 253 253 253
44089-253 253 253 253 253 253 253 253 253 253 253 253
44090-253 253 253 253 253 253 253 253 253 253 253 253
44091-253 253 253 253 253 253 206 206 206 2 2 6
44092- 2 2 6 2 2 6 2 2 6 38 38 38
44093- 2 2 6 2 2 6 2 2 6 2 2 6
44094- 6 6 6 86 86 86 46 46 46 14 14 14
44095- 0 0 0 0 0 0 0 0 0 0 0 0
44096- 0 0 0 0 0 0 0 0 0 0 0 0
44097- 0 0 0 0 0 0 0 0 0 0 0 0
44098- 0 0 0 0 0 0 0 0 0 0 0 0
44099- 0 0 0 0 0 0 0 0 0 0 0 0
44100- 0 0 0 0 0 0 0 0 0 0 0 0
44101- 0 0 0 0 0 0 0 0 0 6 6 6
44102- 18 18 18 46 46 46 86 86 86 18 18 18
44103- 2 2 6 34 34 34 10 10 10 6 6 6
44104-210 210 210 253 253 253 253 253 253 253 253 253
44105-253 253 253 253 253 253 253 253 253 253 253 253
44106-253 253 253 253 253 253 234 234 234 242 242 242
44107-253 253 253 253 253 253 253 253 253 253 253 253
44108-253 253 253 253 253 253 253 253 253 253 253 253
44109-253 253 253 253 253 253 253 253 253 253 253 253
44110-253 253 253 253 253 253 253 253 253 253 253 253
44111-253 253 253 253 253 253 221 221 221 6 6 6
44112- 2 2 6 2 2 6 6 6 6 30 30 30
44113- 2 2 6 2 2 6 2 2 6 2 2 6
44114- 2 2 6 82 82 82 54 54 54 18 18 18
44115- 6 6 6 0 0 0 0 0 0 0 0 0
44116- 0 0 0 0 0 0 0 0 0 0 0 0
44117- 0 0 0 0 0 0 0 0 0 0 0 0
44118- 0 0 0 0 0 0 0 0 0 0 0 0
44119- 0 0 0 0 0 0 0 0 0 0 0 0
44120- 0 0 0 0 0 0 0 0 0 0 0 0
44121- 0 0 0 0 0 0 0 0 0 10 10 10
44122- 26 26 26 66 66 66 62 62 62 2 2 6
44123- 2 2 6 38 38 38 10 10 10 26 26 26
44124-238 238 238 253 253 253 253 253 253 253 253 253
44125-253 253 253 253 253 253 253 253 253 253 253 253
44126-253 253 253 253 253 253 231 231 231 238 238 238
44127-253 253 253 253 253 253 253 253 253 253 253 253
44128-253 253 253 253 253 253 253 253 253 253 253 253
44129-253 253 253 253 253 253 253 253 253 253 253 253
44130-253 253 253 253 253 253 253 253 253 253 253 253
44131-253 253 253 253 253 253 231 231 231 6 6 6
44132- 2 2 6 2 2 6 10 10 10 30 30 30
44133- 2 2 6 2 2 6 2 2 6 2 2 6
44134- 2 2 6 66 66 66 58 58 58 22 22 22
44135- 6 6 6 0 0 0 0 0 0 0 0 0
44136- 0 0 0 0 0 0 0 0 0 0 0 0
44137- 0 0 0 0 0 0 0 0 0 0 0 0
44138- 0 0 0 0 0 0 0 0 0 0 0 0
44139- 0 0 0 0 0 0 0 0 0 0 0 0
44140- 0 0 0 0 0 0 0 0 0 0 0 0
44141- 0 0 0 0 0 0 0 0 0 10 10 10
44142- 38 38 38 78 78 78 6 6 6 2 2 6
44143- 2 2 6 46 46 46 14 14 14 42 42 42
44144-246 246 246 253 253 253 253 253 253 253 253 253
44145-253 253 253 253 253 253 253 253 253 253 253 253
44146-253 253 253 253 253 253 231 231 231 242 242 242
44147-253 253 253 253 253 253 253 253 253 253 253 253
44148-253 253 253 253 253 253 253 253 253 253 253 253
44149-253 253 253 253 253 253 253 253 253 253 253 253
44150-253 253 253 253 253 253 253 253 253 253 253 253
44151-253 253 253 253 253 253 234 234 234 10 10 10
44152- 2 2 6 2 2 6 22 22 22 14 14 14
44153- 2 2 6 2 2 6 2 2 6 2 2 6
44154- 2 2 6 66 66 66 62 62 62 22 22 22
44155- 6 6 6 0 0 0 0 0 0 0 0 0
44156- 0 0 0 0 0 0 0 0 0 0 0 0
44157- 0 0 0 0 0 0 0 0 0 0 0 0
44158- 0 0 0 0 0 0 0 0 0 0 0 0
44159- 0 0 0 0 0 0 0 0 0 0 0 0
44160- 0 0 0 0 0 0 0 0 0 0 0 0
44161- 0 0 0 0 0 0 6 6 6 18 18 18
44162- 50 50 50 74 74 74 2 2 6 2 2 6
44163- 14 14 14 70 70 70 34 34 34 62 62 62
44164-250 250 250 253 253 253 253 253 253 253 253 253
44165-253 253 253 253 253 253 253 253 253 253 253 253
44166-253 253 253 253 253 253 231 231 231 246 246 246
44167-253 253 253 253 253 253 253 253 253 253 253 253
44168-253 253 253 253 253 253 253 253 253 253 253 253
44169-253 253 253 253 253 253 253 253 253 253 253 253
44170-253 253 253 253 253 253 253 253 253 253 253 253
44171-253 253 253 253 253 253 234 234 234 14 14 14
44172- 2 2 6 2 2 6 30 30 30 2 2 6
44173- 2 2 6 2 2 6 2 2 6 2 2 6
44174- 2 2 6 66 66 66 62 62 62 22 22 22
44175- 6 6 6 0 0 0 0 0 0 0 0 0
44176- 0 0 0 0 0 0 0 0 0 0 0 0
44177- 0 0 0 0 0 0 0 0 0 0 0 0
44178- 0 0 0 0 0 0 0 0 0 0 0 0
44179- 0 0 0 0 0 0 0 0 0 0 0 0
44180- 0 0 0 0 0 0 0 0 0 0 0 0
44181- 0 0 0 0 0 0 6 6 6 18 18 18
44182- 54 54 54 62 62 62 2 2 6 2 2 6
44183- 2 2 6 30 30 30 46 46 46 70 70 70
44184-250 250 250 253 253 253 253 253 253 253 253 253
44185-253 253 253 253 253 253 253 253 253 253 253 253
44186-253 253 253 253 253 253 231 231 231 246 246 246
44187-253 253 253 253 253 253 253 253 253 253 253 253
44188-253 253 253 253 253 253 253 253 253 253 253 253
44189-253 253 253 253 253 253 253 253 253 253 253 253
44190-253 253 253 253 253 253 253 253 253 253 253 253
44191-253 253 253 253 253 253 226 226 226 10 10 10
44192- 2 2 6 6 6 6 30 30 30 2 2 6
44193- 2 2 6 2 2 6 2 2 6 2 2 6
44194- 2 2 6 66 66 66 58 58 58 22 22 22
44195- 6 6 6 0 0 0 0 0 0 0 0 0
44196- 0 0 0 0 0 0 0 0 0 0 0 0
44197- 0 0 0 0 0 0 0 0 0 0 0 0
44198- 0 0 0 0 0 0 0 0 0 0 0 0
44199- 0 0 0 0 0 0 0 0 0 0 0 0
44200- 0 0 0 0 0 0 0 0 0 0 0 0
44201- 0 0 0 0 0 0 6 6 6 22 22 22
44202- 58 58 58 62 62 62 2 2 6 2 2 6
44203- 2 2 6 2 2 6 30 30 30 78 78 78
44204-250 250 250 253 253 253 253 253 253 253 253 253
44205-253 253 253 253 253 253 253 253 253 253 253 253
44206-253 253 253 253 253 253 231 231 231 246 246 246
44207-253 253 253 253 253 253 253 253 253 253 253 253
44208-253 253 253 253 253 253 253 253 253 253 253 253
44209-253 253 253 253 253 253 253 253 253 253 253 253
44210-253 253 253 253 253 253 253 253 253 253 253 253
44211-253 253 253 253 253 253 206 206 206 2 2 6
44212- 22 22 22 34 34 34 18 14 6 22 22 22
44213- 26 26 26 18 18 18 6 6 6 2 2 6
44214- 2 2 6 82 82 82 54 54 54 18 18 18
44215- 6 6 6 0 0 0 0 0 0 0 0 0
44216- 0 0 0 0 0 0 0 0 0 0 0 0
44217- 0 0 0 0 0 0 0 0 0 0 0 0
44218- 0 0 0 0 0 0 0 0 0 0 0 0
44219- 0 0 0 0 0 0 0 0 0 0 0 0
44220- 0 0 0 0 0 0 0 0 0 0 0 0
44221- 0 0 0 0 0 0 6 6 6 26 26 26
44222- 62 62 62 106 106 106 74 54 14 185 133 11
44223-210 162 10 121 92 8 6 6 6 62 62 62
44224-238 238 238 253 253 253 253 253 253 253 253 253
44225-253 253 253 253 253 253 253 253 253 253 253 253
44226-253 253 253 253 253 253 231 231 231 246 246 246
44227-253 253 253 253 253 253 253 253 253 253 253 253
44228-253 253 253 253 253 253 253 253 253 253 253 253
44229-253 253 253 253 253 253 253 253 253 253 253 253
44230-253 253 253 253 253 253 253 253 253 253 253 253
44231-253 253 253 253 253 253 158 158 158 18 18 18
44232- 14 14 14 2 2 6 2 2 6 2 2 6
44233- 6 6 6 18 18 18 66 66 66 38 38 38
44234- 6 6 6 94 94 94 50 50 50 18 18 18
44235- 6 6 6 0 0 0 0 0 0 0 0 0
44236- 0 0 0 0 0 0 0 0 0 0 0 0
44237- 0 0 0 0 0 0 0 0 0 0 0 0
44238- 0 0 0 0 0 0 0 0 0 0 0 0
44239- 0 0 0 0 0 0 0 0 0 0 0 0
44240- 0 0 0 0 0 0 0 0 0 6 6 6
44241- 10 10 10 10 10 10 18 18 18 38 38 38
44242- 78 78 78 142 134 106 216 158 10 242 186 14
44243-246 190 14 246 190 14 156 118 10 10 10 10
44244- 90 90 90 238 238 238 253 253 253 253 253 253
44245-253 253 253 253 253 253 253 253 253 253 253 253
44246-253 253 253 253 253 253 231 231 231 250 250 250
44247-253 253 253 253 253 253 253 253 253 253 253 253
44248-253 253 253 253 253 253 253 253 253 253 253 253
44249-253 253 253 253 253 253 253 253 253 253 253 253
44250-253 253 253 253 253 253 253 253 253 246 230 190
44251-238 204 91 238 204 91 181 142 44 37 26 9
44252- 2 2 6 2 2 6 2 2 6 2 2 6
44253- 2 2 6 2 2 6 38 38 38 46 46 46
44254- 26 26 26 106 106 106 54 54 54 18 18 18
44255- 6 6 6 0 0 0 0 0 0 0 0 0
44256- 0 0 0 0 0 0 0 0 0 0 0 0
44257- 0 0 0 0 0 0 0 0 0 0 0 0
44258- 0 0 0 0 0 0 0 0 0 0 0 0
44259- 0 0 0 0 0 0 0 0 0 0 0 0
44260- 0 0 0 6 6 6 14 14 14 22 22 22
44261- 30 30 30 38 38 38 50 50 50 70 70 70
44262-106 106 106 190 142 34 226 170 11 242 186 14
44263-246 190 14 246 190 14 246 190 14 154 114 10
44264- 6 6 6 74 74 74 226 226 226 253 253 253
44265-253 253 253 253 253 253 253 253 253 253 253 253
44266-253 253 253 253 253 253 231 231 231 250 250 250
44267-253 253 253 253 253 253 253 253 253 253 253 253
44268-253 253 253 253 253 253 253 253 253 253 253 253
44269-253 253 253 253 253 253 253 253 253 253 253 253
44270-253 253 253 253 253 253 253 253 253 228 184 62
44271-241 196 14 241 208 19 232 195 16 38 30 10
44272- 2 2 6 2 2 6 2 2 6 2 2 6
44273- 2 2 6 6 6 6 30 30 30 26 26 26
44274-203 166 17 154 142 90 66 66 66 26 26 26
44275- 6 6 6 0 0 0 0 0 0 0 0 0
44276- 0 0 0 0 0 0 0 0 0 0 0 0
44277- 0 0 0 0 0 0 0 0 0 0 0 0
44278- 0 0 0 0 0 0 0 0 0 0 0 0
44279- 0 0 0 0 0 0 0 0 0 0 0 0
44280- 6 6 6 18 18 18 38 38 38 58 58 58
44281- 78 78 78 86 86 86 101 101 101 123 123 123
44282-175 146 61 210 150 10 234 174 13 246 186 14
44283-246 190 14 246 190 14 246 190 14 238 190 10
44284-102 78 10 2 2 6 46 46 46 198 198 198
44285-253 253 253 253 253 253 253 253 253 253 253 253
44286-253 253 253 253 253 253 234 234 234 242 242 242
44287-253 253 253 253 253 253 253 253 253 253 253 253
44288-253 253 253 253 253 253 253 253 253 253 253 253
44289-253 253 253 253 253 253 253 253 253 253 253 253
44290-253 253 253 253 253 253 253 253 253 224 178 62
44291-242 186 14 241 196 14 210 166 10 22 18 6
44292- 2 2 6 2 2 6 2 2 6 2 2 6
44293- 2 2 6 2 2 6 6 6 6 121 92 8
44294-238 202 15 232 195 16 82 82 82 34 34 34
44295- 10 10 10 0 0 0 0 0 0 0 0 0
44296- 0 0 0 0 0 0 0 0 0 0 0 0
44297- 0 0 0 0 0 0 0 0 0 0 0 0
44298- 0 0 0 0 0 0 0 0 0 0 0 0
44299- 0 0 0 0 0 0 0 0 0 0 0 0
44300- 14 14 14 38 38 38 70 70 70 154 122 46
44301-190 142 34 200 144 11 197 138 11 197 138 11
44302-213 154 11 226 170 11 242 186 14 246 190 14
44303-246 190 14 246 190 14 246 190 14 246 190 14
44304-225 175 15 46 32 6 2 2 6 22 22 22
44305-158 158 158 250 250 250 253 253 253 253 253 253
44306-253 253 253 253 253 253 253 253 253 253 253 253
44307-253 253 253 253 253 253 253 253 253 253 253 253
44308-253 253 253 253 253 253 253 253 253 253 253 253
44309-253 253 253 253 253 253 253 253 253 253 253 253
44310-253 253 253 250 250 250 242 242 242 224 178 62
44311-239 182 13 236 186 11 213 154 11 46 32 6
44312- 2 2 6 2 2 6 2 2 6 2 2 6
44313- 2 2 6 2 2 6 61 42 6 225 175 15
44314-238 190 10 236 186 11 112 100 78 42 42 42
44315- 14 14 14 0 0 0 0 0 0 0 0 0
44316- 0 0 0 0 0 0 0 0 0 0 0 0
44317- 0 0 0 0 0 0 0 0 0 0 0 0
44318- 0 0 0 0 0 0 0 0 0 0 0 0
44319- 0 0 0 0 0 0 0 0 0 6 6 6
44320- 22 22 22 54 54 54 154 122 46 213 154 11
44321-226 170 11 230 174 11 226 170 11 226 170 11
44322-236 178 12 242 186 14 246 190 14 246 190 14
44323-246 190 14 246 190 14 246 190 14 246 190 14
44324-241 196 14 184 144 12 10 10 10 2 2 6
44325- 6 6 6 116 116 116 242 242 242 253 253 253
44326-253 253 253 253 253 253 253 253 253 253 253 253
44327-253 253 253 253 253 253 253 253 253 253 253 253
44328-253 253 253 253 253 253 253 253 253 253 253 253
44329-253 253 253 253 253 253 253 253 253 253 253 253
44330-253 253 253 231 231 231 198 198 198 214 170 54
44331-236 178 12 236 178 12 210 150 10 137 92 6
44332- 18 14 6 2 2 6 2 2 6 2 2 6
44333- 6 6 6 70 47 6 200 144 11 236 178 12
44334-239 182 13 239 182 13 124 112 88 58 58 58
44335- 22 22 22 6 6 6 0 0 0 0 0 0
44336- 0 0 0 0 0 0 0 0 0 0 0 0
44337- 0 0 0 0 0 0 0 0 0 0 0 0
44338- 0 0 0 0 0 0 0 0 0 0 0 0
44339- 0 0 0 0 0 0 0 0 0 10 10 10
44340- 30 30 30 70 70 70 180 133 36 226 170 11
44341-239 182 13 242 186 14 242 186 14 246 186 14
44342-246 190 14 246 190 14 246 190 14 246 190 14
44343-246 190 14 246 190 14 246 190 14 246 190 14
44344-246 190 14 232 195 16 98 70 6 2 2 6
44345- 2 2 6 2 2 6 66 66 66 221 221 221
44346-253 253 253 253 253 253 253 253 253 253 253 253
44347-253 253 253 253 253 253 253 253 253 253 253 253
44348-253 253 253 253 253 253 253 253 253 253 253 253
44349-253 253 253 253 253 253 253 253 253 253 253 253
44350-253 253 253 206 206 206 198 198 198 214 166 58
44351-230 174 11 230 174 11 216 158 10 192 133 9
44352-163 110 8 116 81 8 102 78 10 116 81 8
44353-167 114 7 197 138 11 226 170 11 239 182 13
44354-242 186 14 242 186 14 162 146 94 78 78 78
44355- 34 34 34 14 14 14 6 6 6 0 0 0
44356- 0 0 0 0 0 0 0 0 0 0 0 0
44357- 0 0 0 0 0 0 0 0 0 0 0 0
44358- 0 0 0 0 0 0 0 0 0 0 0 0
44359- 0 0 0 0 0 0 0 0 0 6 6 6
44360- 30 30 30 78 78 78 190 142 34 226 170 11
44361-239 182 13 246 190 14 246 190 14 246 190 14
44362-246 190 14 246 190 14 246 190 14 246 190 14
44363-246 190 14 246 190 14 246 190 14 246 190 14
44364-246 190 14 241 196 14 203 166 17 22 18 6
44365- 2 2 6 2 2 6 2 2 6 38 38 38
44366-218 218 218 253 253 253 253 253 253 253 253 253
44367-253 253 253 253 253 253 253 253 253 253 253 253
44368-253 253 253 253 253 253 253 253 253 253 253 253
44369-253 253 253 253 253 253 253 253 253 253 253 253
44370-250 250 250 206 206 206 198 198 198 202 162 69
44371-226 170 11 236 178 12 224 166 10 210 150 10
44372-200 144 11 197 138 11 192 133 9 197 138 11
44373-210 150 10 226 170 11 242 186 14 246 190 14
44374-246 190 14 246 186 14 225 175 15 124 112 88
44375- 62 62 62 30 30 30 14 14 14 6 6 6
44376- 0 0 0 0 0 0 0 0 0 0 0 0
44377- 0 0 0 0 0 0 0 0 0 0 0 0
44378- 0 0 0 0 0 0 0 0 0 0 0 0
44379- 0 0 0 0 0 0 0 0 0 10 10 10
44380- 30 30 30 78 78 78 174 135 50 224 166 10
44381-239 182 13 246 190 14 246 190 14 246 190 14
44382-246 190 14 246 190 14 246 190 14 246 190 14
44383-246 190 14 246 190 14 246 190 14 246 190 14
44384-246 190 14 246 190 14 241 196 14 139 102 15
44385- 2 2 6 2 2 6 2 2 6 2 2 6
44386- 78 78 78 250 250 250 253 253 253 253 253 253
44387-253 253 253 253 253 253 253 253 253 253 253 253
44388-253 253 253 253 253 253 253 253 253 253 253 253
44389-253 253 253 253 253 253 253 253 253 253 253 253
44390-250 250 250 214 214 214 198 198 198 190 150 46
44391-219 162 10 236 178 12 234 174 13 224 166 10
44392-216 158 10 213 154 11 213 154 11 216 158 10
44393-226 170 11 239 182 13 246 190 14 246 190 14
44394-246 190 14 246 190 14 242 186 14 206 162 42
44395-101 101 101 58 58 58 30 30 30 14 14 14
44396- 6 6 6 0 0 0 0 0 0 0 0 0
44397- 0 0 0 0 0 0 0 0 0 0 0 0
44398- 0 0 0 0 0 0 0 0 0 0 0 0
44399- 0 0 0 0 0 0 0 0 0 10 10 10
44400- 30 30 30 74 74 74 174 135 50 216 158 10
44401-236 178 12 246 190 14 246 190 14 246 190 14
44402-246 190 14 246 190 14 246 190 14 246 190 14
44403-246 190 14 246 190 14 246 190 14 246 190 14
44404-246 190 14 246 190 14 241 196 14 226 184 13
44405- 61 42 6 2 2 6 2 2 6 2 2 6
44406- 22 22 22 238 238 238 253 253 253 253 253 253
44407-253 253 253 253 253 253 253 253 253 253 253 253
44408-253 253 253 253 253 253 253 253 253 253 253 253
44409-253 253 253 253 253 253 253 253 253 253 253 253
44410-253 253 253 226 226 226 187 187 187 180 133 36
44411-216 158 10 236 178 12 239 182 13 236 178 12
44412-230 174 11 226 170 11 226 170 11 230 174 11
44413-236 178 12 242 186 14 246 190 14 246 190 14
44414-246 190 14 246 190 14 246 186 14 239 182 13
44415-206 162 42 106 106 106 66 66 66 34 34 34
44416- 14 14 14 6 6 6 0 0 0 0 0 0
44417- 0 0 0 0 0 0 0 0 0 0 0 0
44418- 0 0 0 0 0 0 0 0 0 0 0 0
44419- 0 0 0 0 0 0 0 0 0 6 6 6
44420- 26 26 26 70 70 70 163 133 67 213 154 11
44421-236 178 12 246 190 14 246 190 14 246 190 14
44422-246 190 14 246 190 14 246 190 14 246 190 14
44423-246 190 14 246 190 14 246 190 14 246 190 14
44424-246 190 14 246 190 14 246 190 14 241 196 14
44425-190 146 13 18 14 6 2 2 6 2 2 6
44426- 46 46 46 246 246 246 253 253 253 253 253 253
44427-253 253 253 253 253 253 253 253 253 253 253 253
44428-253 253 253 253 253 253 253 253 253 253 253 253
44429-253 253 253 253 253 253 253 253 253 253 253 253
44430-253 253 253 221 221 221 86 86 86 156 107 11
44431-216 158 10 236 178 12 242 186 14 246 186 14
44432-242 186 14 239 182 13 239 182 13 242 186 14
44433-242 186 14 246 186 14 246 190 14 246 190 14
44434-246 190 14 246 190 14 246 190 14 246 190 14
44435-242 186 14 225 175 15 142 122 72 66 66 66
44436- 30 30 30 10 10 10 0 0 0 0 0 0
44437- 0 0 0 0 0 0 0 0 0 0 0 0
44438- 0 0 0 0 0 0 0 0 0 0 0 0
44439- 0 0 0 0 0 0 0 0 0 6 6 6
44440- 26 26 26 70 70 70 163 133 67 210 150 10
44441-236 178 12 246 190 14 246 190 14 246 190 14
44442-246 190 14 246 190 14 246 190 14 246 190 14
44443-246 190 14 246 190 14 246 190 14 246 190 14
44444-246 190 14 246 190 14 246 190 14 246 190 14
44445-232 195 16 121 92 8 34 34 34 106 106 106
44446-221 221 221 253 253 253 253 253 253 253 253 253
44447-253 253 253 253 253 253 253 253 253 253 253 253
44448-253 253 253 253 253 253 253 253 253 253 253 253
44449-253 253 253 253 253 253 253 253 253 253 253 253
44450-242 242 242 82 82 82 18 14 6 163 110 8
44451-216 158 10 236 178 12 242 186 14 246 190 14
44452-246 190 14 246 190 14 246 190 14 246 190 14
44453-246 190 14 246 190 14 246 190 14 246 190 14
44454-246 190 14 246 190 14 246 190 14 246 190 14
44455-246 190 14 246 190 14 242 186 14 163 133 67
44456- 46 46 46 18 18 18 6 6 6 0 0 0
44457- 0 0 0 0 0 0 0 0 0 0 0 0
44458- 0 0 0 0 0 0 0 0 0 0 0 0
44459- 0 0 0 0 0 0 0 0 0 10 10 10
44460- 30 30 30 78 78 78 163 133 67 210 150 10
44461-236 178 12 246 186 14 246 190 14 246 190 14
44462-246 190 14 246 190 14 246 190 14 246 190 14
44463-246 190 14 246 190 14 246 190 14 246 190 14
44464-246 190 14 246 190 14 246 190 14 246 190 14
44465-241 196 14 215 174 15 190 178 144 253 253 253
44466-253 253 253 253 253 253 253 253 253 253 253 253
44467-253 253 253 253 253 253 253 253 253 253 253 253
44468-253 253 253 253 253 253 253 253 253 253 253 253
44469-253 253 253 253 253 253 253 253 253 218 218 218
44470- 58 58 58 2 2 6 22 18 6 167 114 7
44471-216 158 10 236 178 12 246 186 14 246 190 14
44472-246 190 14 246 190 14 246 190 14 246 190 14
44473-246 190 14 246 190 14 246 190 14 246 190 14
44474-246 190 14 246 190 14 246 190 14 246 190 14
44475-246 190 14 246 186 14 242 186 14 190 150 46
44476- 54 54 54 22 22 22 6 6 6 0 0 0
44477- 0 0 0 0 0 0 0 0 0 0 0 0
44478- 0 0 0 0 0 0 0 0 0 0 0 0
44479- 0 0 0 0 0 0 0 0 0 14 14 14
44480- 38 38 38 86 86 86 180 133 36 213 154 11
44481-236 178 12 246 186 14 246 190 14 246 190 14
44482-246 190 14 246 190 14 246 190 14 246 190 14
44483-246 190 14 246 190 14 246 190 14 246 190 14
44484-246 190 14 246 190 14 246 190 14 246 190 14
44485-246 190 14 232 195 16 190 146 13 214 214 214
44486-253 253 253 253 253 253 253 253 253 253 253 253
44487-253 253 253 253 253 253 253 253 253 253 253 253
44488-253 253 253 253 253 253 253 253 253 253 253 253
44489-253 253 253 250 250 250 170 170 170 26 26 26
44490- 2 2 6 2 2 6 37 26 9 163 110 8
44491-219 162 10 239 182 13 246 186 14 246 190 14
44492-246 190 14 246 190 14 246 190 14 246 190 14
44493-246 190 14 246 190 14 246 190 14 246 190 14
44494-246 190 14 246 190 14 246 190 14 246 190 14
44495-246 186 14 236 178 12 224 166 10 142 122 72
44496- 46 46 46 18 18 18 6 6 6 0 0 0
44497- 0 0 0 0 0 0 0 0 0 0 0 0
44498- 0 0 0 0 0 0 0 0 0 0 0 0
44499- 0 0 0 0 0 0 6 6 6 18 18 18
44500- 50 50 50 109 106 95 192 133 9 224 166 10
44501-242 186 14 246 190 14 246 190 14 246 190 14
44502-246 190 14 246 190 14 246 190 14 246 190 14
44503-246 190 14 246 190 14 246 190 14 246 190 14
44504-246 190 14 246 190 14 246 190 14 246 190 14
44505-242 186 14 226 184 13 210 162 10 142 110 46
44506-226 226 226 253 253 253 253 253 253 253 253 253
44507-253 253 253 253 253 253 253 253 253 253 253 253
44508-253 253 253 253 253 253 253 253 253 253 253 253
44509-198 198 198 66 66 66 2 2 6 2 2 6
44510- 2 2 6 2 2 6 50 34 6 156 107 11
44511-219 162 10 239 182 13 246 186 14 246 190 14
44512-246 190 14 246 190 14 246 190 14 246 190 14
44513-246 190 14 246 190 14 246 190 14 246 190 14
44514-246 190 14 246 190 14 246 190 14 242 186 14
44515-234 174 13 213 154 11 154 122 46 66 66 66
44516- 30 30 30 10 10 10 0 0 0 0 0 0
44517- 0 0 0 0 0 0 0 0 0 0 0 0
44518- 0 0 0 0 0 0 0 0 0 0 0 0
44519- 0 0 0 0 0 0 6 6 6 22 22 22
44520- 58 58 58 154 121 60 206 145 10 234 174 13
44521-242 186 14 246 186 14 246 190 14 246 190 14
44522-246 190 14 246 190 14 246 190 14 246 190 14
44523-246 190 14 246 190 14 246 190 14 246 190 14
44524-246 190 14 246 190 14 246 190 14 246 190 14
44525-246 186 14 236 178 12 210 162 10 163 110 8
44526- 61 42 6 138 138 138 218 218 218 250 250 250
44527-253 253 253 253 253 253 253 253 253 250 250 250
44528-242 242 242 210 210 210 144 144 144 66 66 66
44529- 6 6 6 2 2 6 2 2 6 2 2 6
44530- 2 2 6 2 2 6 61 42 6 163 110 8
44531-216 158 10 236 178 12 246 190 14 246 190 14
44532-246 190 14 246 190 14 246 190 14 246 190 14
44533-246 190 14 246 190 14 246 190 14 246 190 14
44534-246 190 14 239 182 13 230 174 11 216 158 10
44535-190 142 34 124 112 88 70 70 70 38 38 38
44536- 18 18 18 6 6 6 0 0 0 0 0 0
44537- 0 0 0 0 0 0 0 0 0 0 0 0
44538- 0 0 0 0 0 0 0 0 0 0 0 0
44539- 0 0 0 0 0 0 6 6 6 22 22 22
44540- 62 62 62 168 124 44 206 145 10 224 166 10
44541-236 178 12 239 182 13 242 186 14 242 186 14
44542-246 186 14 246 190 14 246 190 14 246 190 14
44543-246 190 14 246 190 14 246 190 14 246 190 14
44544-246 190 14 246 190 14 246 190 14 246 190 14
44545-246 190 14 236 178 12 216 158 10 175 118 6
44546- 80 54 7 2 2 6 6 6 6 30 30 30
44547- 54 54 54 62 62 62 50 50 50 38 38 38
44548- 14 14 14 2 2 6 2 2 6 2 2 6
44549- 2 2 6 2 2 6 2 2 6 2 2 6
44550- 2 2 6 6 6 6 80 54 7 167 114 7
44551-213 154 11 236 178 12 246 190 14 246 190 14
44552-246 190 14 246 190 14 246 190 14 246 190 14
44553-246 190 14 242 186 14 239 182 13 239 182 13
44554-230 174 11 210 150 10 174 135 50 124 112 88
44555- 82 82 82 54 54 54 34 34 34 18 18 18
44556- 6 6 6 0 0 0 0 0 0 0 0 0
44557- 0 0 0 0 0 0 0 0 0 0 0 0
44558- 0 0 0 0 0 0 0 0 0 0 0 0
44559- 0 0 0 0 0 0 6 6 6 18 18 18
44560- 50 50 50 158 118 36 192 133 9 200 144 11
44561-216 158 10 219 162 10 224 166 10 226 170 11
44562-230 174 11 236 178 12 239 182 13 239 182 13
44563-242 186 14 246 186 14 246 190 14 246 190 14
44564-246 190 14 246 190 14 246 190 14 246 190 14
44565-246 186 14 230 174 11 210 150 10 163 110 8
44566-104 69 6 10 10 10 2 2 6 2 2 6
44567- 2 2 6 2 2 6 2 2 6 2 2 6
44568- 2 2 6 2 2 6 2 2 6 2 2 6
44569- 2 2 6 2 2 6 2 2 6 2 2 6
44570- 2 2 6 6 6 6 91 60 6 167 114 7
44571-206 145 10 230 174 11 242 186 14 246 190 14
44572-246 190 14 246 190 14 246 186 14 242 186 14
44573-239 182 13 230 174 11 224 166 10 213 154 11
44574-180 133 36 124 112 88 86 86 86 58 58 58
44575- 38 38 38 22 22 22 10 10 10 6 6 6
44576- 0 0 0 0 0 0 0 0 0 0 0 0
44577- 0 0 0 0 0 0 0 0 0 0 0 0
44578- 0 0 0 0 0 0 0 0 0 0 0 0
44579- 0 0 0 0 0 0 0 0 0 14 14 14
44580- 34 34 34 70 70 70 138 110 50 158 118 36
44581-167 114 7 180 123 7 192 133 9 197 138 11
44582-200 144 11 206 145 10 213 154 11 219 162 10
44583-224 166 10 230 174 11 239 182 13 242 186 14
44584-246 186 14 246 186 14 246 186 14 246 186 14
44585-239 182 13 216 158 10 185 133 11 152 99 6
44586-104 69 6 18 14 6 2 2 6 2 2 6
44587- 2 2 6 2 2 6 2 2 6 2 2 6
44588- 2 2 6 2 2 6 2 2 6 2 2 6
44589- 2 2 6 2 2 6 2 2 6 2 2 6
44590- 2 2 6 6 6 6 80 54 7 152 99 6
44591-192 133 9 219 162 10 236 178 12 239 182 13
44592-246 186 14 242 186 14 239 182 13 236 178 12
44593-224 166 10 206 145 10 192 133 9 154 121 60
44594- 94 94 94 62 62 62 42 42 42 22 22 22
44595- 14 14 14 6 6 6 0 0 0 0 0 0
44596- 0 0 0 0 0 0 0 0 0 0 0 0
44597- 0 0 0 0 0 0 0 0 0 0 0 0
44598- 0 0 0 0 0 0 0 0 0 0 0 0
44599- 0 0 0 0 0 0 0 0 0 6 6 6
44600- 18 18 18 34 34 34 58 58 58 78 78 78
44601-101 98 89 124 112 88 142 110 46 156 107 11
44602-163 110 8 167 114 7 175 118 6 180 123 7
44603-185 133 11 197 138 11 210 150 10 219 162 10
44604-226 170 11 236 178 12 236 178 12 234 174 13
44605-219 162 10 197 138 11 163 110 8 130 83 6
44606- 91 60 6 10 10 10 2 2 6 2 2 6
44607- 18 18 18 38 38 38 38 38 38 38 38 38
44608- 38 38 38 38 38 38 38 38 38 38 38 38
44609- 38 38 38 38 38 38 26 26 26 2 2 6
44610- 2 2 6 6 6 6 70 47 6 137 92 6
44611-175 118 6 200 144 11 219 162 10 230 174 11
44612-234 174 13 230 174 11 219 162 10 210 150 10
44613-192 133 9 163 110 8 124 112 88 82 82 82
44614- 50 50 50 30 30 30 14 14 14 6 6 6
44615- 0 0 0 0 0 0 0 0 0 0 0 0
44616- 0 0 0 0 0 0 0 0 0 0 0 0
44617- 0 0 0 0 0 0 0 0 0 0 0 0
44618- 0 0 0 0 0 0 0 0 0 0 0 0
44619- 0 0 0 0 0 0 0 0 0 0 0 0
44620- 6 6 6 14 14 14 22 22 22 34 34 34
44621- 42 42 42 58 58 58 74 74 74 86 86 86
44622-101 98 89 122 102 70 130 98 46 121 87 25
44623-137 92 6 152 99 6 163 110 8 180 123 7
44624-185 133 11 197 138 11 206 145 10 200 144 11
44625-180 123 7 156 107 11 130 83 6 104 69 6
44626- 50 34 6 54 54 54 110 110 110 101 98 89
44627- 86 86 86 82 82 82 78 78 78 78 78 78
44628- 78 78 78 78 78 78 78 78 78 78 78 78
44629- 78 78 78 82 82 82 86 86 86 94 94 94
44630-106 106 106 101 101 101 86 66 34 124 80 6
44631-156 107 11 180 123 7 192 133 9 200 144 11
44632-206 145 10 200 144 11 192 133 9 175 118 6
44633-139 102 15 109 106 95 70 70 70 42 42 42
44634- 22 22 22 10 10 10 0 0 0 0 0 0
44635- 0 0 0 0 0 0 0 0 0 0 0 0
44636- 0 0 0 0 0 0 0 0 0 0 0 0
44637- 0 0 0 0 0 0 0 0 0 0 0 0
44638- 0 0 0 0 0 0 0 0 0 0 0 0
44639- 0 0 0 0 0 0 0 0 0 0 0 0
44640- 0 0 0 0 0 0 6 6 6 10 10 10
44641- 14 14 14 22 22 22 30 30 30 38 38 38
44642- 50 50 50 62 62 62 74 74 74 90 90 90
44643-101 98 89 112 100 78 121 87 25 124 80 6
44644-137 92 6 152 99 6 152 99 6 152 99 6
44645-138 86 6 124 80 6 98 70 6 86 66 30
44646-101 98 89 82 82 82 58 58 58 46 46 46
44647- 38 38 38 34 34 34 34 34 34 34 34 34
44648- 34 34 34 34 34 34 34 34 34 34 34 34
44649- 34 34 34 34 34 34 38 38 38 42 42 42
44650- 54 54 54 82 82 82 94 86 76 91 60 6
44651-134 86 6 156 107 11 167 114 7 175 118 6
44652-175 118 6 167 114 7 152 99 6 121 87 25
44653-101 98 89 62 62 62 34 34 34 18 18 18
44654- 6 6 6 0 0 0 0 0 0 0 0 0
44655- 0 0 0 0 0 0 0 0 0 0 0 0
44656- 0 0 0 0 0 0 0 0 0 0 0 0
44657- 0 0 0 0 0 0 0 0 0 0 0 0
44658- 0 0 0 0 0 0 0 0 0 0 0 0
44659- 0 0 0 0 0 0 0 0 0 0 0 0
44660- 0 0 0 0 0 0 0 0 0 0 0 0
44661- 0 0 0 6 6 6 6 6 6 10 10 10
44662- 18 18 18 22 22 22 30 30 30 42 42 42
44663- 50 50 50 66 66 66 86 86 86 101 98 89
44664-106 86 58 98 70 6 104 69 6 104 69 6
44665-104 69 6 91 60 6 82 62 34 90 90 90
44666- 62 62 62 38 38 38 22 22 22 14 14 14
44667- 10 10 10 10 10 10 10 10 10 10 10 10
44668- 10 10 10 10 10 10 6 6 6 10 10 10
44669- 10 10 10 10 10 10 10 10 10 14 14 14
44670- 22 22 22 42 42 42 70 70 70 89 81 66
44671- 80 54 7 104 69 6 124 80 6 137 92 6
44672-134 86 6 116 81 8 100 82 52 86 86 86
44673- 58 58 58 30 30 30 14 14 14 6 6 6
44674- 0 0 0 0 0 0 0 0 0 0 0 0
44675- 0 0 0 0 0 0 0 0 0 0 0 0
44676- 0 0 0 0 0 0 0 0 0 0 0 0
44677- 0 0 0 0 0 0 0 0 0 0 0 0
44678- 0 0 0 0 0 0 0 0 0 0 0 0
44679- 0 0 0 0 0 0 0 0 0 0 0 0
44680- 0 0 0 0 0 0 0 0 0 0 0 0
44681- 0 0 0 0 0 0 0 0 0 0 0 0
44682- 0 0 0 6 6 6 10 10 10 14 14 14
44683- 18 18 18 26 26 26 38 38 38 54 54 54
44684- 70 70 70 86 86 86 94 86 76 89 81 66
44685- 89 81 66 86 86 86 74 74 74 50 50 50
44686- 30 30 30 14 14 14 6 6 6 0 0 0
44687- 0 0 0 0 0 0 0 0 0 0 0 0
44688- 0 0 0 0 0 0 0 0 0 0 0 0
44689- 0 0 0 0 0 0 0 0 0 0 0 0
44690- 6 6 6 18 18 18 34 34 34 58 58 58
44691- 82 82 82 89 81 66 89 81 66 89 81 66
44692- 94 86 66 94 86 76 74 74 74 50 50 50
44693- 26 26 26 14 14 14 6 6 6 0 0 0
44694- 0 0 0 0 0 0 0 0 0 0 0 0
44695- 0 0 0 0 0 0 0 0 0 0 0 0
44696- 0 0 0 0 0 0 0 0 0 0 0 0
44697- 0 0 0 0 0 0 0 0 0 0 0 0
44698- 0 0 0 0 0 0 0 0 0 0 0 0
44699- 0 0 0 0 0 0 0 0 0 0 0 0
44700- 0 0 0 0 0 0 0 0 0 0 0 0
44701- 0 0 0 0 0 0 0 0 0 0 0 0
44702- 0 0 0 0 0 0 0 0 0 0 0 0
44703- 6 6 6 6 6 6 14 14 14 18 18 18
44704- 30 30 30 38 38 38 46 46 46 54 54 54
44705- 50 50 50 42 42 42 30 30 30 18 18 18
44706- 10 10 10 0 0 0 0 0 0 0 0 0
44707- 0 0 0 0 0 0 0 0 0 0 0 0
44708- 0 0 0 0 0 0 0 0 0 0 0 0
44709- 0 0 0 0 0 0 0 0 0 0 0 0
44710- 0 0 0 6 6 6 14 14 14 26 26 26
44711- 38 38 38 50 50 50 58 58 58 58 58 58
44712- 54 54 54 42 42 42 30 30 30 18 18 18
44713- 10 10 10 0 0 0 0 0 0 0 0 0
44714- 0 0 0 0 0 0 0 0 0 0 0 0
44715- 0 0 0 0 0 0 0 0 0 0 0 0
44716- 0 0 0 0 0 0 0 0 0 0 0 0
44717- 0 0 0 0 0 0 0 0 0 0 0 0
44718- 0 0 0 0 0 0 0 0 0 0 0 0
44719- 0 0 0 0 0 0 0 0 0 0 0 0
44720- 0 0 0 0 0 0 0 0 0 0 0 0
44721- 0 0 0 0 0 0 0 0 0 0 0 0
44722- 0 0 0 0 0 0 0 0 0 0 0 0
44723- 0 0 0 0 0 0 0 0 0 6 6 6
44724- 6 6 6 10 10 10 14 14 14 18 18 18
44725- 18 18 18 14 14 14 10 10 10 6 6 6
44726- 0 0 0 0 0 0 0 0 0 0 0 0
44727- 0 0 0 0 0 0 0 0 0 0 0 0
44728- 0 0 0 0 0 0 0 0 0 0 0 0
44729- 0 0 0 0 0 0 0 0 0 0 0 0
44730- 0 0 0 0 0 0 0 0 0 6 6 6
44731- 14 14 14 18 18 18 22 22 22 22 22 22
44732- 18 18 18 14 14 14 10 10 10 6 6 6
44733- 0 0 0 0 0 0 0 0 0 0 0 0
44734- 0 0 0 0 0 0 0 0 0 0 0 0
44735- 0 0 0 0 0 0 0 0 0 0 0 0
44736- 0 0 0 0 0 0 0 0 0 0 0 0
44737- 0 0 0 0 0 0 0 0 0 0 0 0
44738+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44739+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44740+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44741+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44742+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44743+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44744+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44745+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44748+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44749+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44750+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44751+4 4 4 4 4 4
44752+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44758+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44759+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44762+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44763+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44764+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44765+4 4 4 4 4 4
44766+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44767+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44772+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44773+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44776+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44777+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44778+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44779+4 4 4 4 4 4
44780+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44786+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44787+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44789+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44790+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44791+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44792+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44793+4 4 4 4 4 4
44794+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44795+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44800+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44801+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44803+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44805+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44806+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44807+4 4 4 4 4 4
44808+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44809+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44810+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44814+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44815+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44816+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44817+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44819+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44820+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44821+4 4 4 4 4 4
44822+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44823+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44824+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44825+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44826+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
44827+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
44828+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44829+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44830+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44831+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
44832+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
44833+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
44834+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44835+4 4 4 4 4 4
44836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44839+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44840+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
44841+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
44842+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44843+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44844+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44845+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
44846+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
44847+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
44848+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44849+4 4 4 4 4 4
44850+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44851+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44852+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44853+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44854+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
44855+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
44856+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
44857+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44858+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44859+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
44860+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
44861+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
44862+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
44863+4 4 4 4 4 4
44864+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44865+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44866+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44867+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
44868+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
44869+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
44870+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
44871+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44872+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
44873+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
44874+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
44875+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
44876+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
44877+4 4 4 4 4 4
44878+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44879+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44880+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44881+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
44882+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
44883+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
44884+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
44885+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
44886+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
44887+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
44888+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
44889+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
44890+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
44891+4 4 4 4 4 4
44892+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44893+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44894+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
44895+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
44896+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
44897+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
44898+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
44899+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
44900+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
44901+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
44902+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
44903+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
44904+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
44905+4 4 4 4 4 4
44906+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44907+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44908+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
44909+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
44910+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
44911+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
44912+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
44913+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
44914+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
44915+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
44916+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
44917+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
44918+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
44919+4 4 4 4 4 4
44920+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44921+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44922+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
44923+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
44924+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
44925+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
44926+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
44927+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
44928+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
44929+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
44930+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
44931+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
44932+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
44933+4 4 4 4 4 4
44934+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44935+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44936+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
44937+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
44938+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
44939+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
44940+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
44941+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
44942+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
44943+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
44944+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
44945+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
44946+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
44947+4 4 4 4 4 4
44948+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44949+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44950+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
44951+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
44952+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
44953+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
44954+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
44955+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
44956+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
44957+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
44958+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
44959+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
44960+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
44961+4 4 4 4 4 4
44962+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44963+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
44964+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
44965+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
44966+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
44967+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
44968+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
44969+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
44970+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
44971+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
44972+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
44973+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
44974+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
44975+4 4 4 4 4 4
44976+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44977+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
44978+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
44979+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
44980+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
44981+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
44982+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
44983+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
44984+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
44985+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
44986+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
44987+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
44988+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
44989+0 0 0 4 4 4
44990+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
44991+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
44992+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
44993+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
44994+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
44995+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
44996+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
44997+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
44998+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
44999+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
45000+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
45001+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
45002+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
45003+2 0 0 0 0 0
45004+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
45005+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
45006+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
45007+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
45008+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
45009+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
45010+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
45011+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
45012+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
45013+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
45014+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
45015+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
45016+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
45017+37 38 37 0 0 0
45018+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
45019+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
45020+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
45021+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
45022+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
45023+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
45024+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
45025+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
45026+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
45027+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
45028+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
45029+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
45030+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
45031+85 115 134 4 0 0
45032+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
45033+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
45034+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
45035+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
45036+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
45037+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
45038+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
45039+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
45040+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
45041+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
45042+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
45043+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
45044+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
45045+60 73 81 4 0 0
45046+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
45047+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
45048+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
45049+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
45050+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
45051+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
45052+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
45053+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
45054+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
45055+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
45056+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
45057+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
45058+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
45059+16 19 21 4 0 0
45060+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
45061+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
45062+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
45063+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
45064+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
45065+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
45066+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
45067+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
45068+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
45069+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
45070+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
45071+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
45072+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
45073+4 0 0 4 3 3
45074+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
45075+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
45076+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
45077+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
45078+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
45079+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
45080+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
45081+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
45082+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
45083+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
45084+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
45085+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
45086+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
45087+3 2 2 4 4 4
45088+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
45089+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
45090+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
45091+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
45092+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
45093+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
45094+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
45095+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
45096+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
45097+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
45098+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
45099+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
45100+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
45101+4 4 4 4 4 4
45102+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
45103+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
45104+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
45105+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
45106+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
45107+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
45108+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
45109+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
45110+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
45111+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
45112+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
45113+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
45114+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
45115+4 4 4 4 4 4
45116+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
45117+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
45118+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
45119+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
45120+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
45121+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
45122+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
45123+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
45124+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
45125+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
45126+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
45127+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
45128+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
45129+5 5 5 5 5 5
45130+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
45131+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
45132+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
45133+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
45134+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
45135+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
45136+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
45137+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
45138+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
45139+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
45140+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
45141+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
45142+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
45143+5 5 5 4 4 4
45144+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
45145+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
45146+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
45147+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
45148+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
45149+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
45150+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
45151+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
45152+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
45153+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
45154+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
45155+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
45156+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45157+4 4 4 4 4 4
45158+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
45159+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
45160+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
45161+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
45162+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
45163+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
45164+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
45165+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
45166+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
45167+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
45168+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
45169+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
45170+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45171+4 4 4 4 4 4
45172+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
45173+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
45174+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
45175+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
45176+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
45177+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
45178+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
45179+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
45180+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
45181+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
45182+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
45183+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45184+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45185+4 4 4 4 4 4
45186+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
45187+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
45188+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
45189+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
45190+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
45191+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
45192+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
45193+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
45194+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
45195+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
45196+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
45197+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45198+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45199+4 4 4 4 4 4
45200+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
45201+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
45202+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
45203+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
45204+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
45205+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
45206+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
45207+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
45208+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
45209+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
45210+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45211+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45212+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45213+4 4 4 4 4 4
45214+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
45215+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
45216+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
45217+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
45218+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
45219+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
45220+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
45221+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
45222+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
45223+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
45224+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
45225+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45226+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45227+4 4 4 4 4 4
45228+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
45229+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
45230+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
45231+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
45232+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
45233+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
45234+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
45235+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
45236+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
45237+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
45238+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
45239+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45240+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45241+4 4 4 4 4 4
45242+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
45243+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
45244+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
45245+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
45246+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
45247+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
45248+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
45249+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
45250+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
45251+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
45252+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45253+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45254+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45255+4 4 4 4 4 4
45256+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
45257+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
45258+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
45259+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
45260+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45261+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
45262+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
45263+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
45264+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
45265+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
45266+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45267+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45268+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45269+4 4 4 4 4 4
45270+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
45271+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
45272+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
45273+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
45274+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45275+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
45276+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
45277+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
45278+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
45279+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
45280+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45281+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45282+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45283+4 4 4 4 4 4
45284+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
45285+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
45286+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
45287+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
45288+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45289+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
45290+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
45291+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
45292+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
45293+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45294+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45295+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45296+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45297+4 4 4 4 4 4
45298+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
45299+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
45300+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
45301+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
45302+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
45303+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
45304+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
45305+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
45306+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
45307+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45308+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45309+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45310+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45311+4 4 4 4 4 4
45312+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
45313+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
45314+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
45315+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
45316+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45317+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
45318+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
45319+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
45320+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
45321+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45322+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45323+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45324+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45325+4 4 4 4 4 4
45326+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
45327+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
45328+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
45329+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
45330+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
45331+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
45332+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
45333+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
45334+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
45335+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45336+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45337+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45338+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45339+4 4 4 4 4 4
45340+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
45341+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
45342+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
45343+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
45344+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
45345+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
45346+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
45347+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
45348+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
45349+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45350+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45351+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45352+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45353+4 4 4 4 4 4
45354+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
45355+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
45356+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
45357+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
45358+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
45359+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
45360+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
45361+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
45362+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
45363+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45364+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45365+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45366+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45367+4 4 4 4 4 4
45368+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
45369+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
45370+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
45371+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
45372+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
45373+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
45374+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
45375+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
45376+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
45377+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45378+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45379+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45380+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45381+4 4 4 4 4 4
45382+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
45383+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
45384+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
45385+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
45386+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
45387+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
45388+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
45389+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
45390+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
45391+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45392+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45394+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45395+4 4 4 4 4 4
45396+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
45397+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
45398+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
45399+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
45400+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
45401+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
45402+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
45403+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
45404+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
45405+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45406+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45407+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45408+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45409+4 4 4 4 4 4
45410+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
45411+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
45412+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
45413+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
45414+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
45415+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
45416+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45417+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
45418+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
45419+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45420+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45423+4 4 4 4 4 4
45424+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
45425+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
45426+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
45427+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
45428+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
45429+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
45430+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45431+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
45432+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
45433+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45434+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45437+4 4 4 4 4 4
45438+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
45439+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
45440+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
45441+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
45442+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
45443+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
45444+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
45445+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
45446+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
45447+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45448+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45451+4 4 4 4 4 4
45452+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
45453+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
45454+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
45455+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
45456+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
45457+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
45458+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
45459+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
45460+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
45461+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45462+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45465+4 4 4 4 4 4
45466+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
45467+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
45468+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
45469+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
45470+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
45471+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
45472+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
45473+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
45474+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
45475+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45476+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45479+4 4 4 4 4 4
45480+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
45481+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
45482+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
45483+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
45484+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
45485+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
45486+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
45487+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
45488+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
45489+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45490+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45493+4 4 4 4 4 4
45494+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
45495+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
45496+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
45497+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
45498+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
45499+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
45500+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
45501+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
45502+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
45503+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
45504+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45507+4 4 4 4 4 4
45508+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
45509+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
45510+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
45511+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
45512+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
45513+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
45514+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
45515+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
45516+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
45517+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
45518+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45521+4 4 4 4 4 4
45522+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
45523+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
45524+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
45525+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
45526+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
45527+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
45528+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45529+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
45530+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
45531+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
45532+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
45533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45534+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45535+4 4 4 4 4 4
45536+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
45537+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
45538+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
45539+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
45540+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
45541+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
45542+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
45543+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
45544+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
45545+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
45546+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45548+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45549+4 4 4 4 4 4
45550+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
45551+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
45552+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
45553+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
45554+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
45555+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
45556+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
45557+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
45558+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
45559+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
45560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45562+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45563+4 4 4 4 4 4
45564+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
45565+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
45566+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
45567+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
45568+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
45569+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
45570+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
45571+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
45572+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
45573+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
45574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45576+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45577+4 4 4 4 4 4
45578+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
45579+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
45580+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
45581+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
45582+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
45583+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
45584+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
45585+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
45586+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
45587+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
45588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45590+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45591+4 4 4 4 4 4
45592+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
45593+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
45594+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
45595+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
45596+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
45597+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
45598+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
45599+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
45600+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
45601+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
45602+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45603+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45604+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45605+4 4 4 4 4 4
45606+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
45607+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
45608+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
45609+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
45610+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
45611+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
45612+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
45613+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
45614+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
45615+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45616+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45617+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45618+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45619+4 4 4 4 4 4
45620+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
45621+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
45622+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
45623+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
45624+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
45625+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
45626+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
45627+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
45628+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
45629+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45630+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45631+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45632+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45633+4 4 4 4 4 4
45634+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
45635+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
45636+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
45637+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
45638+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
45639+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
45640+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
45641+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
45642+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45643+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45644+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45645+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45646+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45647+4 4 4 4 4 4
45648+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
45649+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
45650+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
45651+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
45652+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
45653+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
45654+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
45655+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
45656+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45657+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45658+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45659+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45660+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45661+4 4 4 4 4 4
45662+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
45663+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
45664+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
45665+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
45666+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
45667+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
45668+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
45669+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
45670+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45671+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45672+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45673+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45674+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45675+4 4 4 4 4 4
45676+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
45677+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
45678+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
45679+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
45680+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
45681+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
45682+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
45683+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
45684+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45685+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45688+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45689+4 4 4 4 4 4
45690+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45691+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
45692+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
45693+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
45694+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
45695+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
45696+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
45697+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
45698+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45699+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45702+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45703+4 4 4 4 4 4
45704+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45705+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
45706+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
45707+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
45708+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
45709+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
45710+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
45711+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
45712+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45713+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45714+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45715+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45716+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45717+4 4 4 4 4 4
45718+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45719+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45720+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
45721+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
45722+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
45723+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
45724+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
45725+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
45726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45727+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45728+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45729+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45730+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45731+4 4 4 4 4 4
45732+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45733+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45734+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
45735+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
45736+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
45737+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
45738+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
45739+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45740+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45741+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45742+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45743+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45744+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45745+4 4 4 4 4 4
45746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45748+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45749+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
45750+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
45751+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
45752+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
45753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45758+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45759+4 4 4 4 4 4
45760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45762+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45763+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
45764+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
45765+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
45766+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
45767+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45772+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45773+4 4 4 4 4 4
45774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45776+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45777+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
45778+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
45779+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
45780+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
45781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45786+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45787+4 4 4 4 4 4
45788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45789+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45790+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45791+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
45792+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
45793+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
45794+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45795+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45800+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45801+4 4 4 4 4 4
45802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45803+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45805+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45806+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
45807+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
45808+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
45809+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45810+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45814+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45815+4 4 4 4 4 4
45816+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45817+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45819+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45820+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
45821+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
45822+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45823+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45824+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45825+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45827+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45828+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45829+4 4 4 4 4 4
45830+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45831+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45833+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45834+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
45835+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
45836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45839+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45842+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45843+4 4 4 4 4 4
45844+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45845+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45846+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45847+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45848+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
45849+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
45850+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45851+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45852+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45853+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45855+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45856+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45857+4 4 4 4 4 4
45858diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c
45859index 443e3c8..c443d6a 100644
45860--- a/drivers/video/nvidia/nv_backlight.c
45861+++ b/drivers/video/nvidia/nv_backlight.c
45862@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(struct backlight_device *bd)
45863 return bd->props.brightness;
45864 }
45865
45866-static struct backlight_ops nvidia_bl_ops = {
45867+static const struct backlight_ops nvidia_bl_ops = {
45868 .get_brightness = nvidia_bl_get_brightness,
45869 .update_status = nvidia_bl_update_status,
45870 };
45871diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
45872index d94c57f..912984c 100644
45873--- a/drivers/video/riva/fbdev.c
45874+++ b/drivers/video/riva/fbdev.c
45875@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct backlight_device *bd)
45876 return bd->props.brightness;
45877 }
45878
45879-static struct backlight_ops riva_bl_ops = {
45880+static const struct backlight_ops riva_bl_ops = {
45881 .get_brightness = riva_bl_get_brightness,
45882 .update_status = riva_bl_update_status,
45883 };
45884diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
45885index 54fbb29..2c108fc 100644
45886--- a/drivers/video/uvesafb.c
45887+++ b/drivers/video/uvesafb.c
45888@@ -18,6 +18,7 @@
45889 #include <linux/fb.h>
45890 #include <linux/io.h>
45891 #include <linux/mutex.h>
45892+#include <linux/moduleloader.h>
45893 #include <video/edid.h>
45894 #include <video/uvesafb.h>
45895 #ifdef CONFIG_X86
45896@@ -120,7 +121,7 @@ static int uvesafb_helper_start(void)
45897 NULL,
45898 };
45899
45900- return call_usermodehelper(v86d_path, argv, envp, 1);
45901+ return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
45902 }
45903
45904 /*
45905@@ -568,10 +569,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
45906 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
45907 par->pmi_setpal = par->ypan = 0;
45908 } else {
45909+
45910+#ifdef CONFIG_PAX_KERNEXEC
45911+#ifdef CONFIG_MODULES
45912+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
45913+#endif
45914+ if (!par->pmi_code) {
45915+ par->pmi_setpal = par->ypan = 0;
45916+ return 0;
45917+ }
45918+#endif
45919+
45920 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
45921 + task->t.regs.edi);
45922+
45923+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
45924+ pax_open_kernel();
45925+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
45926+ pax_close_kernel();
45927+
45928+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
45929+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
45930+#else
45931 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
45932 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
45933+#endif
45934+
45935 printk(KERN_INFO "uvesafb: protected mode interface info at "
45936 "%04x:%04x\n",
45937 (u16)task->t.regs.es, (u16)task->t.regs.edi);
45938@@ -1799,6 +1822,11 @@ out:
45939 if (par->vbe_modes)
45940 kfree(par->vbe_modes);
45941
45942+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
45943+ if (par->pmi_code)
45944+ module_free_exec(NULL, par->pmi_code);
45945+#endif
45946+
45947 framebuffer_release(info);
45948 return err;
45949 }
45950@@ -1825,6 +1853,12 @@ static int uvesafb_remove(struct platform_device *dev)
45951 kfree(par->vbe_state_orig);
45952 if (par->vbe_state_saved)
45953 kfree(par->vbe_state_saved);
45954+
45955+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
45956+ if (par->pmi_code)
45957+ module_free_exec(NULL, par->pmi_code);
45958+#endif
45959+
45960 }
45961
45962 framebuffer_release(info);
45963diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
45964index bd37ee1..cb827e8 100644
45965--- a/drivers/video/vesafb.c
45966+++ b/drivers/video/vesafb.c
45967@@ -9,6 +9,7 @@
45968 */
45969
45970 #include <linux/module.h>
45971+#include <linux/moduleloader.h>
45972 #include <linux/kernel.h>
45973 #include <linux/errno.h>
45974 #include <linux/string.h>
45975@@ -53,8 +54,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
45976 static int vram_total __initdata; /* Set total amount of memory */
45977 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
45978 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
45979-static void (*pmi_start)(void) __read_mostly;
45980-static void (*pmi_pal) (void) __read_mostly;
45981+static void (*pmi_start)(void) __read_only;
45982+static void (*pmi_pal) (void) __read_only;
45983 static int depth __read_mostly;
45984 static int vga_compat __read_mostly;
45985 /* --------------------------------------------------------------------- */
45986@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
45987 unsigned int size_vmode;
45988 unsigned int size_remap;
45989 unsigned int size_total;
45990+ void *pmi_code = NULL;
45991
45992 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
45993 return -ENODEV;
45994@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
45995 size_remap = size_total;
45996 vesafb_fix.smem_len = size_remap;
45997
45998-#ifndef __i386__
45999- screen_info.vesapm_seg = 0;
46000-#endif
46001-
46002 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
46003 printk(KERN_WARNING
46004 "vesafb: cannot reserve video memory at 0x%lx\n",
46005@@ -315,9 +313,21 @@ static int __init vesafb_probe(struct platform_device *dev)
46006 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
46007 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
46008
46009+#ifdef __i386__
46010+
46011+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
46012+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
46013+ if (!pmi_code)
46014+#elif !defined(CONFIG_PAX_KERNEXEC)
46015+ if (0)
46016+#endif
46017+
46018+#endif
46019+ screen_info.vesapm_seg = 0;
46020+
46021 if (screen_info.vesapm_seg) {
46022- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
46023- screen_info.vesapm_seg,screen_info.vesapm_off);
46024+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
46025+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
46026 }
46027
46028 if (screen_info.vesapm_seg < 0xc000)
46029@@ -325,9 +335,25 @@ static int __init vesafb_probe(struct platform_device *dev)
46030
46031 if (ypan || pmi_setpal) {
46032 unsigned short *pmi_base;
46033+
46034 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
46035- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
46036- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
46037+
46038+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
46039+ pax_open_kernel();
46040+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
46041+#else
46042+ pmi_code = pmi_base;
46043+#endif
46044+
46045+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
46046+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
46047+
46048+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
46049+ pmi_start = ktva_ktla(pmi_start);
46050+ pmi_pal = ktva_ktla(pmi_pal);
46051+ pax_close_kernel();
46052+#endif
46053+
46054 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
46055 if (pmi_base[3]) {
46056 printk(KERN_INFO "vesafb: pmi: ports = ");
46057@@ -469,6 +495,11 @@ static int __init vesafb_probe(struct platform_device *dev)
46058 info->node, info->fix.id);
46059 return 0;
46060 err:
46061+
46062+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
46063+ module_free_exec(NULL, pmi_code);
46064+#endif
46065+
46066 if (info->screen_base)
46067 iounmap(info->screen_base);
46068 framebuffer_release(info);
46069diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c
46070index 88a60e0..6783cc2 100644
46071--- a/drivers/xen/sys-hypervisor.c
46072+++ b/drivers/xen/sys-hypervisor.c
46073@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct kobject *kobj,
46074 return 0;
46075 }
46076
46077-static struct sysfs_ops hyp_sysfs_ops = {
46078+static const struct sysfs_ops hyp_sysfs_ops = {
46079 .show = hyp_sysfs_show,
46080 .store = hyp_sysfs_store,
46081 };
46082diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
46083index 18f74ec..3227009 100644
46084--- a/fs/9p/vfs_inode.c
46085+++ b/fs/9p/vfs_inode.c
46086@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
46087 static void
46088 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
46089 {
46090- char *s = nd_get_link(nd);
46091+ const char *s = nd_get_link(nd);
46092
46093 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
46094 IS_ERR(s) ? "<error>" : s);
46095diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
46096index bb4cc5b..df5eaa0 100644
46097--- a/fs/Kconfig.binfmt
46098+++ b/fs/Kconfig.binfmt
46099@@ -86,7 +86,7 @@ config HAVE_AOUT
46100
46101 config BINFMT_AOUT
46102 tristate "Kernel support for a.out and ECOFF binaries"
46103- depends on HAVE_AOUT
46104+ depends on HAVE_AOUT && BROKEN
46105 ---help---
46106 A.out (Assembler.OUTput) is a set of formats for libraries and
46107 executables used in the earliest versions of UNIX. Linux used
46108diff --git a/fs/aio.c b/fs/aio.c
46109index 22a19ad..d484e5b 100644
46110--- a/fs/aio.c
46111+++ b/fs/aio.c
46112@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx *ctx)
46113 size += sizeof(struct io_event) * nr_events;
46114 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
46115
46116- if (nr_pages < 0)
46117+ if (nr_pages <= 0)
46118 return -EINVAL;
46119
46120 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
46121@@ -1089,6 +1089,8 @@ static int read_events(struct kioctx *ctx,
46122 struct aio_timeout to;
46123 int retry = 0;
46124
46125+ pax_track_stack();
46126+
46127 /* needed to zero any padding within an entry (there shouldn't be
46128 * any, but C is fun!
46129 */
46130@@ -1382,13 +1384,18 @@ static ssize_t aio_fsync(struct kiocb *iocb)
46131 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb)
46132 {
46133 ssize_t ret;
46134+ struct iovec iovstack;
46135
46136 ret = rw_copy_check_uvector(type, (struct iovec __user *)kiocb->ki_buf,
46137 kiocb->ki_nbytes, 1,
46138- &kiocb->ki_inline_vec, &kiocb->ki_iovec);
46139+ &iovstack, &kiocb->ki_iovec);
46140 if (ret < 0)
46141 goto out;
46142
46143+ if (kiocb->ki_iovec == &iovstack) {
46144+ kiocb->ki_inline_vec = iovstack;
46145+ kiocb->ki_iovec = &kiocb->ki_inline_vec;
46146+ }
46147 kiocb->ki_nr_segs = kiocb->ki_nbytes;
46148 kiocb->ki_cur_seg = 0;
46149 /* ki_nbytes/left now reflect bytes instead of segs */
46150diff --git a/fs/attr.c b/fs/attr.c
46151index 96d394b..33cf5b4 100644
46152--- a/fs/attr.c
46153+++ b/fs/attr.c
46154@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
46155 unsigned long limit;
46156
46157 limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
46158+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
46159 if (limit != RLIM_INFINITY && offset > limit)
46160 goto out_sig;
46161 if (offset > inode->i_sb->s_maxbytes)
46162diff --git a/fs/autofs/root.c b/fs/autofs/root.c
46163index 4a1401c..05eb5ca 100644
46164--- a/fs/autofs/root.c
46165+++ b/fs/autofs/root.c
46166@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct inode *dir, struct dentry *dentry, const c
46167 set_bit(n,sbi->symlink_bitmap);
46168 sl = &sbi->symlink[n];
46169 sl->len = strlen(symname);
46170- sl->data = kmalloc(slsize = sl->len+1, GFP_KERNEL);
46171+ slsize = sl->len+1;
46172+ sl->data = kmalloc(slsize, GFP_KERNEL);
46173 if (!sl->data) {
46174 clear_bit(n,sbi->symlink_bitmap);
46175 unlock_kernel();
46176diff --git a/fs/autofs4/symlink.c b/fs/autofs4/symlink.c
46177index b4ea829..e63ef18 100644
46178--- a/fs/autofs4/symlink.c
46179+++ b/fs/autofs4/symlink.c
46180@@ -15,7 +15,7 @@
46181 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
46182 {
46183 struct autofs_info *ino = autofs4_dentry_ino(dentry);
46184- nd_set_link(nd, (char *)ino->u.symlink);
46185+ nd_set_link(nd, ino->u.symlink);
46186 return NULL;
46187 }
46188
46189diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
46190index 2341375..df9d1c2 100644
46191--- a/fs/autofs4/waitq.c
46192+++ b/fs/autofs4/waitq.c
46193@@ -60,7 +60,7 @@ static int autofs4_write(struct file *file, const void *addr, int bytes)
46194 {
46195 unsigned long sigpipe, flags;
46196 mm_segment_t fs;
46197- const char *data = (const char *)addr;
46198+ const char __user *data = (const char __force_user *)addr;
46199 ssize_t wr = 0;
46200
46201 /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
46202diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
46203index 9158c07..3f06659 100644
46204--- a/fs/befs/linuxvfs.c
46205+++ b/fs/befs/linuxvfs.c
46206@@ -498,7 +498,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
46207 {
46208 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
46209 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
46210- char *link = nd_get_link(nd);
46211+ const char *link = nd_get_link(nd);
46212 if (!IS_ERR(link))
46213 kfree(link);
46214 }
46215diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
46216index 0133b5a..b3baa9f 100644
46217--- a/fs/binfmt_aout.c
46218+++ b/fs/binfmt_aout.c
46219@@ -16,6 +16,7 @@
46220 #include <linux/string.h>
46221 #include <linux/fs.h>
46222 #include <linux/file.h>
46223+#include <linux/security.h>
46224 #include <linux/stat.h>
46225 #include <linux/fcntl.h>
46226 #include <linux/ptrace.h>
46227@@ -102,6 +103,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, u
46228 #endif
46229 # define START_STACK(u) (u.start_stack)
46230
46231+ memset(&dump, 0, sizeof(dump));
46232+
46233 fs = get_fs();
46234 set_fs(KERNEL_DS);
46235 has_dumped = 1;
46236@@ -113,10 +116,12 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, u
46237
46238 /* If the size of the dump file exceeds the rlimit, then see what would happen
46239 if we wrote the stack, but not the data area. */
46240+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
46241 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > limit)
46242 dump.u_dsize = 0;
46243
46244 /* Make sure we have enough room to write the stack and data areas. */
46245+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
46246 if ((dump.u_ssize + 1) * PAGE_SIZE > limit)
46247 dump.u_ssize = 0;
46248
46249@@ -146,9 +151,7 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, u
46250 dump_size = dump.u_ssize << PAGE_SHIFT;
46251 DUMP_WRITE(dump_start,dump_size);
46252 }
46253-/* Finally dump the task struct. Not be used by gdb, but could be useful */
46254- set_fs(KERNEL_DS);
46255- DUMP_WRITE(current,sizeof(*current));
46256+/* Finally, let's not dump the task struct. Not be used by gdb, but could be useful to an attacker */
46257 end_coredump:
46258 set_fs(fs);
46259 return has_dumped;
46260@@ -249,6 +252,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
46261 rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
46262 if (rlim >= RLIM_INFINITY)
46263 rlim = ~0;
46264+
46265+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
46266 if (ex.a_data + ex.a_bss > rlim)
46267 return -ENOMEM;
46268
46269@@ -277,6 +282,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
46270 install_exec_creds(bprm);
46271 current->flags &= ~PF_FORKNOEXEC;
46272
46273+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
46274+ current->mm->pax_flags = 0UL;
46275+#endif
46276+
46277+#ifdef CONFIG_PAX_PAGEEXEC
46278+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
46279+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
46280+
46281+#ifdef CONFIG_PAX_EMUTRAMP
46282+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
46283+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
46284+#endif
46285+
46286+#ifdef CONFIG_PAX_MPROTECT
46287+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
46288+ current->mm->pax_flags |= MF_PAX_MPROTECT;
46289+#endif
46290+
46291+ }
46292+#endif
46293+
46294 if (N_MAGIC(ex) == OMAGIC) {
46295 unsigned long text_addr, map_size;
46296 loff_t pos;
46297@@ -349,7 +375,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
46298
46299 down_write(&current->mm->mmap_sem);
46300 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
46301- PROT_READ | PROT_WRITE | PROT_EXEC,
46302+ PROT_READ | PROT_WRITE,
46303 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
46304 fd_offset + ex.a_text);
46305 up_write(&current->mm->mmap_sem);
46306diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
46307index 1ed37ba..de82ab7 100644
46308--- a/fs/binfmt_elf.c
46309+++ b/fs/binfmt_elf.c
46310@@ -31,6 +31,7 @@
46311 #include <linux/random.h>
46312 #include <linux/elf.h>
46313 #include <linux/utsname.h>
46314+#include <linux/xattr.h>
46315 #include <asm/uaccess.h>
46316 #include <asm/param.h>
46317 #include <asm/page.h>
46318@@ -50,6 +51,10 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
46319 #define elf_core_dump NULL
46320 #endif
46321
46322+#ifdef CONFIG_PAX_MPROTECT
46323+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
46324+#endif
46325+
46326 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
46327 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
46328 #else
46329@@ -69,6 +74,11 @@ static struct linux_binfmt elf_format = {
46330 .load_binary = load_elf_binary,
46331 .load_shlib = load_elf_library,
46332 .core_dump = elf_core_dump,
46333+
46334+#ifdef CONFIG_PAX_MPROTECT
46335+ .handle_mprotect= elf_handle_mprotect,
46336+#endif
46337+
46338 .min_coredump = ELF_EXEC_PAGESIZE,
46339 .hasvdso = 1
46340 };
46341@@ -77,6 +87,8 @@ static struct linux_binfmt elf_format = {
46342
46343 static int set_brk(unsigned long start, unsigned long end)
46344 {
46345+ unsigned long e = end;
46346+
46347 start = ELF_PAGEALIGN(start);
46348 end = ELF_PAGEALIGN(end);
46349 if (end > start) {
46350@@ -87,7 +99,7 @@ static int set_brk(unsigned long start, unsigned long end)
46351 if (BAD_ADDR(addr))
46352 return addr;
46353 }
46354- current->mm->start_brk = current->mm->brk = end;
46355+ current->mm->start_brk = current->mm->brk = e;
46356 return 0;
46357 }
46358
46359@@ -148,12 +160,15 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
46360 elf_addr_t __user *u_rand_bytes;
46361 const char *k_platform = ELF_PLATFORM;
46362 const char *k_base_platform = ELF_BASE_PLATFORM;
46363- unsigned char k_rand_bytes[16];
46364+ u32 k_rand_bytes[4];
46365 int items;
46366 elf_addr_t *elf_info;
46367 int ei_index = 0;
46368 const struct cred *cred = current_cred();
46369 struct vm_area_struct *vma;
46370+ unsigned long saved_auxv[AT_VECTOR_SIZE];
46371+
46372+ pax_track_stack();
46373
46374 /*
46375 * In some cases (e.g. Hyper-Threading), we want to avoid L1
46376@@ -195,8 +210,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
46377 * Generate 16 random bytes for userspace PRNG seeding.
46378 */
46379 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
46380- u_rand_bytes = (elf_addr_t __user *)
46381- STACK_ALLOC(p, sizeof(k_rand_bytes));
46382+ srandom32(k_rand_bytes[0] ^ random32());
46383+ srandom32(k_rand_bytes[1] ^ random32());
46384+ srandom32(k_rand_bytes[2] ^ random32());
46385+ srandom32(k_rand_bytes[3] ^ random32());
46386+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
46387+ u_rand_bytes = (elf_addr_t __user *) p;
46388 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
46389 return -EFAULT;
46390
46391@@ -308,9 +327,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
46392 return -EFAULT;
46393 current->mm->env_end = p;
46394
46395+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
46396+
46397 /* Put the elf_info on the stack in the right place. */
46398 sp = (elf_addr_t __user *)envp + 1;
46399- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
46400+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
46401 return -EFAULT;
46402 return 0;
46403 }
46404@@ -385,10 +406,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
46405 {
46406 struct elf_phdr *elf_phdata;
46407 struct elf_phdr *eppnt;
46408- unsigned long load_addr = 0;
46409+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
46410 int load_addr_set = 0;
46411 unsigned long last_bss = 0, elf_bss = 0;
46412- unsigned long error = ~0UL;
46413+ unsigned long error = -EINVAL;
46414 unsigned long total_size;
46415 int retval, i, size;
46416
46417@@ -434,6 +455,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
46418 goto out_close;
46419 }
46420
46421+#ifdef CONFIG_PAX_SEGMEXEC
46422+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
46423+ pax_task_size = SEGMEXEC_TASK_SIZE;
46424+#endif
46425+
46426 eppnt = elf_phdata;
46427 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
46428 if (eppnt->p_type == PT_LOAD) {
46429@@ -477,8 +503,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
46430 k = load_addr + eppnt->p_vaddr;
46431 if (BAD_ADDR(k) ||
46432 eppnt->p_filesz > eppnt->p_memsz ||
46433- eppnt->p_memsz > TASK_SIZE ||
46434- TASK_SIZE - eppnt->p_memsz < k) {
46435+ eppnt->p_memsz > pax_task_size ||
46436+ pax_task_size - eppnt->p_memsz < k) {
46437 error = -ENOMEM;
46438 goto out_close;
46439 }
46440@@ -532,6 +558,351 @@ out:
46441 return error;
46442 }
46443
46444+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
46445+{
46446+ unsigned long pax_flags = 0UL;
46447+
46448+#ifdef CONFIG_PAX_PT_PAX_FLAGS
46449+
46450+#ifdef CONFIG_PAX_PAGEEXEC
46451+ if (elf_phdata->p_flags & PF_PAGEEXEC)
46452+ pax_flags |= MF_PAX_PAGEEXEC;
46453+#endif
46454+
46455+#ifdef CONFIG_PAX_SEGMEXEC
46456+ if (elf_phdata->p_flags & PF_SEGMEXEC)
46457+ pax_flags |= MF_PAX_SEGMEXEC;
46458+#endif
46459+
46460+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
46461+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46462+ if (nx_enabled)
46463+ pax_flags &= ~MF_PAX_SEGMEXEC;
46464+ else
46465+ pax_flags &= ~MF_PAX_PAGEEXEC;
46466+ }
46467+#endif
46468+
46469+#ifdef CONFIG_PAX_EMUTRAMP
46470+ if (elf_phdata->p_flags & PF_EMUTRAMP)
46471+ pax_flags |= MF_PAX_EMUTRAMP;
46472+#endif
46473+
46474+#ifdef CONFIG_PAX_MPROTECT
46475+ if (elf_phdata->p_flags & PF_MPROTECT)
46476+ pax_flags |= MF_PAX_MPROTECT;
46477+#endif
46478+
46479+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
46480+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
46481+ pax_flags |= MF_PAX_RANDMMAP;
46482+#endif
46483+
46484+#endif
46485+
46486+ return pax_flags;
46487+}
46488+
46489+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
46490+{
46491+ unsigned long pax_flags = 0UL;
46492+
46493+#ifdef CONFIG_PAX_PT_PAX_FLAGS
46494+
46495+#ifdef CONFIG_PAX_PAGEEXEC
46496+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
46497+ pax_flags |= MF_PAX_PAGEEXEC;
46498+#endif
46499+
46500+#ifdef CONFIG_PAX_SEGMEXEC
46501+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
46502+ pax_flags |= MF_PAX_SEGMEXEC;
46503+#endif
46504+
46505+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
46506+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46507+ if (nx_enabled)
46508+ pax_flags &= ~MF_PAX_SEGMEXEC;
46509+ else
46510+ pax_flags &= ~MF_PAX_PAGEEXEC;
46511+ }
46512+#endif
46513+
46514+#ifdef CONFIG_PAX_EMUTRAMP
46515+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
46516+ pax_flags |= MF_PAX_EMUTRAMP;
46517+#endif
46518+
46519+#ifdef CONFIG_PAX_MPROTECT
46520+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
46521+ pax_flags |= MF_PAX_MPROTECT;
46522+#endif
46523+
46524+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
46525+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
46526+ pax_flags |= MF_PAX_RANDMMAP;
46527+#endif
46528+
46529+#endif
46530+
46531+ return pax_flags;
46532+}
46533+
46534+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
46535+{
46536+ unsigned long pax_flags = 0UL;
46537+
46538+#ifdef CONFIG_PAX_EI_PAX
46539+
46540+#ifdef CONFIG_PAX_PAGEEXEC
46541+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
46542+ pax_flags |= MF_PAX_PAGEEXEC;
46543+#endif
46544+
46545+#ifdef CONFIG_PAX_SEGMEXEC
46546+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
46547+ pax_flags |= MF_PAX_SEGMEXEC;
46548+#endif
46549+
46550+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
46551+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46552+ if (nx_enabled)
46553+ pax_flags &= ~MF_PAX_SEGMEXEC;
46554+ else
46555+ pax_flags &= ~MF_PAX_PAGEEXEC;
46556+ }
46557+#endif
46558+
46559+#ifdef CONFIG_PAX_EMUTRAMP
46560+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
46561+ pax_flags |= MF_PAX_EMUTRAMP;
46562+#endif
46563+
46564+#ifdef CONFIG_PAX_MPROTECT
46565+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
46566+ pax_flags |= MF_PAX_MPROTECT;
46567+#endif
46568+
46569+#ifdef CONFIG_PAX_ASLR
46570+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
46571+ pax_flags |= MF_PAX_RANDMMAP;
46572+#endif
46573+
46574+#else
46575+
46576+#ifdef CONFIG_PAX_PAGEEXEC
46577+ pax_flags |= MF_PAX_PAGEEXEC;
46578+#endif
46579+
46580+#ifdef CONFIG_PAX_MPROTECT
46581+ pax_flags |= MF_PAX_MPROTECT;
46582+#endif
46583+
46584+#ifdef CONFIG_PAX_RANDMMAP
46585+ pax_flags |= MF_PAX_RANDMMAP;
46586+#endif
46587+
46588+#ifdef CONFIG_PAX_SEGMEXEC
46589+ if (!(__supported_pte_mask & _PAGE_NX)) {
46590+ pax_flags &= ~MF_PAX_PAGEEXEC;
46591+ pax_flags |= MF_PAX_SEGMEXEC;
46592+ }
46593+#endif
46594+
46595+#endif
46596+
46597+ return pax_flags;
46598+}
46599+
46600+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
46601+{
46602+
46603+#ifdef CONFIG_PAX_PT_PAX_FLAGS
46604+ unsigned long i;
46605+
46606+ for (i = 0UL; i < elf_ex->e_phnum; i++)
46607+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
46608+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
46609+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
46610+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
46611+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
46612+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
46613+ return ~0UL;
46614+
46615+#ifdef CONFIG_PAX_SOFTMODE
46616+ if (pax_softmode)
46617+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
46618+ else
46619+#endif
46620+
46621+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
46622+ break;
46623+ }
46624+#endif
46625+
46626+ return ~0UL;
46627+}
46628+
46629+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
46630+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
46631+{
46632+ unsigned long pax_flags = 0UL;
46633+
46634+#ifdef CONFIG_PAX_PAGEEXEC
46635+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
46636+ pax_flags |= MF_PAX_PAGEEXEC;
46637+#endif
46638+
46639+#ifdef CONFIG_PAX_SEGMEXEC
46640+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
46641+ pax_flags |= MF_PAX_SEGMEXEC;
46642+#endif
46643+
46644+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
46645+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46646+ if ((__supported_pte_mask & _PAGE_NX))
46647+ pax_flags &= ~MF_PAX_SEGMEXEC;
46648+ else
46649+ pax_flags &= ~MF_PAX_PAGEEXEC;
46650+ }
46651+#endif
46652+
46653+#ifdef CONFIG_PAX_EMUTRAMP
46654+ if (pax_flags_softmode & MF_PAX_EMUTRAMP)
46655+ pax_flags |= MF_PAX_EMUTRAMP;
46656+#endif
46657+
46658+#ifdef CONFIG_PAX_MPROTECT
46659+ if (pax_flags_softmode & MF_PAX_MPROTECT)
46660+ pax_flags |= MF_PAX_MPROTECT;
46661+#endif
46662+
46663+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
46664+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
46665+ pax_flags |= MF_PAX_RANDMMAP;
46666+#endif
46667+
46668+ return pax_flags;
46669+}
46670+
46671+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
46672+{
46673+ unsigned long pax_flags = 0UL;
46674+
46675+#ifdef CONFIG_PAX_PAGEEXEC
46676+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
46677+ pax_flags |= MF_PAX_PAGEEXEC;
46678+#endif
46679+
46680+#ifdef CONFIG_PAX_SEGMEXEC
46681+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
46682+ pax_flags |= MF_PAX_SEGMEXEC;
46683+#endif
46684+
46685+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
46686+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46687+ if ((__supported_pte_mask & _PAGE_NX))
46688+ pax_flags &= ~MF_PAX_SEGMEXEC;
46689+ else
46690+ pax_flags &= ~MF_PAX_PAGEEXEC;
46691+ }
46692+#endif
46693+
46694+#ifdef CONFIG_PAX_EMUTRAMP
46695+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
46696+ pax_flags |= MF_PAX_EMUTRAMP;
46697+#endif
46698+
46699+#ifdef CONFIG_PAX_MPROTECT
46700+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
46701+ pax_flags |= MF_PAX_MPROTECT;
46702+#endif
46703+
46704+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
46705+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
46706+ pax_flags |= MF_PAX_RANDMMAP;
46707+#endif
46708+
46709+ return pax_flags;
46710+}
46711+#endif
46712+
46713+static unsigned long pax_parse_xattr_pax(struct file * const file)
46714+{
46715+
46716+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
46717+ ssize_t xattr_size, i;
46718+ unsigned char xattr_value[5];
46719+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
46720+
46721+ xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
46722+ if (xattr_size <= 0)
46723+ return ~0UL;
46724+
46725+ for (i = 0; i < xattr_size; i++)
46726+ switch (xattr_value[i]) {
46727+ default:
46728+ return ~0UL;
46729+
46730+#define parse_flag(option1, option2, flag) \
46731+ case option1: \
46732+ pax_flags_hardmode |= MF_PAX_##flag; \
46733+ break; \
46734+ case option2: \
46735+ pax_flags_softmode |= MF_PAX_##flag; \
46736+ break;
46737+
46738+ parse_flag('p', 'P', PAGEEXEC);
46739+ parse_flag('e', 'E', EMUTRAMP);
46740+ parse_flag('m', 'M', MPROTECT);
46741+ parse_flag('r', 'R', RANDMMAP);
46742+ parse_flag('s', 'S', SEGMEXEC);
46743+
46744+#undef parse_flag
46745+ }
46746+
46747+ if (pax_flags_hardmode & pax_flags_softmode)
46748+ return ~0UL;
46749+
46750+#ifdef CONFIG_PAX_SOFTMODE
46751+ if (pax_softmode)
46752+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
46753+ else
46754+#endif
46755+
46756+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
46757+#else
46758+ return ~0UL;
46759+#endif
46760+
46761+}
46762+
46763+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
46764+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
46765+{
46766+ unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
46767+
46768+ pax_flags = pax_parse_ei_pax(elf_ex);
46769+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
46770+ xattr_pax_flags = pax_parse_xattr_pax(file);
46771+
46772+ if (pt_pax_flags == ~0UL)
46773+ pt_pax_flags = xattr_pax_flags;
46774+ else if (xattr_pax_flags == ~0UL)
46775+ xattr_pax_flags = pt_pax_flags;
46776+ if (pt_pax_flags != xattr_pax_flags)
46777+ return -EINVAL;
46778+ if (pt_pax_flags != ~0UL)
46779+ pax_flags = pt_pax_flags;
46780+
46781+ if (0 > pax_check_flags(&pax_flags))
46782+ return -EINVAL;
46783+
46784+ current->mm->pax_flags = pax_flags;
46785+ return 0;
46786+}
46787+#endif
46788+
46789 /*
46790 * These are the functions used to load ELF style executables and shared
46791 * libraries. There is no binary dependent code anywhere else.
46792@@ -548,6 +919,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
46793 {
46794 unsigned int random_variable = 0;
46795
46796+#ifdef CONFIG_PAX_RANDUSTACK
46797+ if (randomize_va_space)
46798+ return stack_top - current->mm->delta_stack;
46799+#endif
46800+
46801 if ((current->flags & PF_RANDOMIZE) &&
46802 !(current->personality & ADDR_NO_RANDOMIZE)) {
46803 random_variable = get_random_int() & STACK_RND_MASK;
46804@@ -566,7 +942,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
46805 unsigned long load_addr = 0, load_bias = 0;
46806 int load_addr_set = 0;
46807 char * elf_interpreter = NULL;
46808- unsigned long error;
46809+ unsigned long error = 0;
46810 struct elf_phdr *elf_ppnt, *elf_phdata;
46811 unsigned long elf_bss, elf_brk;
46812 int retval, i;
46813@@ -576,11 +952,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
46814 unsigned long start_code, end_code, start_data, end_data;
46815 unsigned long reloc_func_desc = 0;
46816 int executable_stack = EXSTACK_DEFAULT;
46817- unsigned long def_flags = 0;
46818 struct {
46819 struct elfhdr elf_ex;
46820 struct elfhdr interp_elf_ex;
46821 } *loc;
46822+ unsigned long pax_task_size = TASK_SIZE;
46823
46824 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
46825 if (!loc) {
46826@@ -718,11 +1094,80 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
46827
46828 /* OK, This is the point of no return */
46829 current->flags &= ~PF_FORKNOEXEC;
46830- current->mm->def_flags = def_flags;
46831+
46832+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
46833+ current->mm->pax_flags = 0UL;
46834+#endif
46835+
46836+#ifdef CONFIG_PAX_DLRESOLVE
46837+ current->mm->call_dl_resolve = 0UL;
46838+#endif
46839+
46840+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
46841+ current->mm->call_syscall = 0UL;
46842+#endif
46843+
46844+#ifdef CONFIG_PAX_ASLR
46845+ current->mm->delta_mmap = 0UL;
46846+ current->mm->delta_stack = 0UL;
46847+#endif
46848+
46849+ current->mm->def_flags = 0;
46850+
46851+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
46852+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
46853+ send_sig(SIGKILL, current, 0);
46854+ goto out_free_dentry;
46855+ }
46856+#endif
46857+
46858+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
46859+ pax_set_initial_flags(bprm);
46860+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
46861+ if (pax_set_initial_flags_func)
46862+ (pax_set_initial_flags_func)(bprm);
46863+#endif
46864+
46865+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
46866+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !nx_enabled) {
46867+ current->mm->context.user_cs_limit = PAGE_SIZE;
46868+ current->mm->def_flags |= VM_PAGEEXEC;
46869+ }
46870+#endif
46871+
46872+#ifdef CONFIG_PAX_SEGMEXEC
46873+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
46874+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
46875+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
46876+ pax_task_size = SEGMEXEC_TASK_SIZE;
46877+ }
46878+#endif
46879+
46880+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
46881+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46882+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
46883+ put_cpu();
46884+ }
46885+#endif
46886
46887 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
46888 may depend on the personality. */
46889 SET_PERSONALITY(loc->elf_ex);
46890+
46891+#ifdef CONFIG_PAX_ASLR
46892+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
46893+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
46894+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
46895+ }
46896+#endif
46897+
46898+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
46899+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46900+ executable_stack = EXSTACK_DISABLE_X;
46901+ current->personality &= ~READ_IMPLIES_EXEC;
46902+ } else
46903+#endif
46904+
46905 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
46906 current->personality |= READ_IMPLIES_EXEC;
46907
46908@@ -800,10 +1245,27 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
46909 * might try to exec. This is because the brk will
46910 * follow the loader, and is not movable. */
46911 #ifdef CONFIG_X86
46912- load_bias = 0;
46913+ if (current->flags & PF_RANDOMIZE)
46914+ load_bias = 0;
46915+ else
46916+ load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
46917 #else
46918 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
46919 #endif
46920+
46921+#ifdef CONFIG_PAX_RANDMMAP
46922+ /* PaX: randomize base address at the default exe base if requested */
46923+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
46924+#ifdef CONFIG_SPARC64
46925+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
46926+#else
46927+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
46928+#endif
46929+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
46930+ elf_flags |= MAP_FIXED;
46931+ }
46932+#endif
46933+
46934 }
46935
46936 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
46937@@ -836,9 +1298,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
46938 * allowed task size. Note that p_filesz must always be
46939 * <= p_memsz so it is only necessary to check p_memsz.
46940 */
46941- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
46942- elf_ppnt->p_memsz > TASK_SIZE ||
46943- TASK_SIZE - elf_ppnt->p_memsz < k) {
46944+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
46945+ elf_ppnt->p_memsz > pax_task_size ||
46946+ pax_task_size - elf_ppnt->p_memsz < k) {
46947 /* set_brk can never work. Avoid overflows. */
46948 send_sig(SIGKILL, current, 0);
46949 retval = -EINVAL;
46950@@ -866,6 +1328,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
46951 start_data += load_bias;
46952 end_data += load_bias;
46953
46954+#ifdef CONFIG_PAX_RANDMMAP
46955+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
46956+ elf_brk += PAGE_SIZE + ((pax_get_random_long() & ~PAGE_MASK) << 4);
46957+#endif
46958+
46959 /* Calling set_brk effectively mmaps the pages that we need
46960 * for the bss and break sections. We must do this before
46961 * mapping in the interpreter, to make sure it doesn't wind
46962@@ -877,9 +1344,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
46963 goto out_free_dentry;
46964 }
46965 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
46966- send_sig(SIGSEGV, current, 0);
46967- retval = -EFAULT; /* Nobody gets to see this, but.. */
46968- goto out_free_dentry;
46969+ /*
46970+ * This bss-zeroing can fail if the ELF
46971+ * file specifies odd protections. So
46972+ * we don't check the return value
46973+ */
46974 }
46975
46976 if (elf_interpreter) {
46977@@ -1112,8 +1581,10 @@ static int dump_seek(struct file *file, loff_t off)
46978 unsigned long n = off;
46979 if (n > PAGE_SIZE)
46980 n = PAGE_SIZE;
46981- if (!dump_write(file, buf, n))
46982+ if (!dump_write(file, buf, n)) {
46983+ free_page((unsigned long)buf);
46984 return 0;
46985+ }
46986 off -= n;
46987 }
46988 free_page((unsigned long)buf);
46989@@ -1125,7 +1596,7 @@ static int dump_seek(struct file *file, loff_t off)
46990 * Decide what to dump of a segment, part, all or none.
46991 */
46992 static unsigned long vma_dump_size(struct vm_area_struct *vma,
46993- unsigned long mm_flags)
46994+ unsigned long mm_flags, long signr)
46995 {
46996 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
46997
46998@@ -1159,7 +1630,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
46999 if (vma->vm_file == NULL)
47000 return 0;
47001
47002- if (FILTER(MAPPED_PRIVATE))
47003+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
47004 goto whole;
47005
47006 /*
47007@@ -1255,8 +1726,11 @@ static int writenote(struct memelfnote *men, struct file *file,
47008 #undef DUMP_WRITE
47009
47010 #define DUMP_WRITE(addr, nr) \
47011+ do { \
47012+ gr_learn_resource(current, RLIMIT_CORE, size + (nr), 1); \
47013 if ((size += (nr)) > limit || !dump_write(file, (addr), (nr))) \
47014- goto end_coredump;
47015+ goto end_coredump; \
47016+ } while (0);
47017
47018 static void fill_elf_header(struct elfhdr *elf, int segs,
47019 u16 machine, u32 flags, u8 osabi)
47020@@ -1385,9 +1859,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
47021 {
47022 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
47023 int i = 0;
47024- do
47025+ do {
47026 i += 2;
47027- while (auxv[i - 2] != AT_NULL);
47028+ } while (auxv[i - 2] != AT_NULL);
47029 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
47030 }
47031
47032@@ -1973,7 +2447,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
47033 phdr.p_offset = offset;
47034 phdr.p_vaddr = vma->vm_start;
47035 phdr.p_paddr = 0;
47036- phdr.p_filesz = vma_dump_size(vma, mm_flags);
47037+ phdr.p_filesz = vma_dump_size(vma, mm_flags, signr);
47038 phdr.p_memsz = vma->vm_end - vma->vm_start;
47039 offset += phdr.p_filesz;
47040 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
47041@@ -2006,7 +2480,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
47042 unsigned long addr;
47043 unsigned long end;
47044
47045- end = vma->vm_start + vma_dump_size(vma, mm_flags);
47046+ end = vma->vm_start + vma_dump_size(vma, mm_flags, signr);
47047
47048 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
47049 struct page *page;
47050@@ -2015,6 +2489,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
47051 page = get_dump_page(addr);
47052 if (page) {
47053 void *kaddr = kmap(page);
47054+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
47055 stop = ((size += PAGE_SIZE) > limit) ||
47056 !dump_write(file, kaddr, PAGE_SIZE);
47057 kunmap(page);
47058@@ -2042,6 +2517,97 @@ out:
47059
47060 #endif /* USE_ELF_CORE_DUMP */
47061
47062+#ifdef CONFIG_PAX_MPROTECT
47063+/* PaX: non-PIC ELF libraries need relocations on their executable segments
47064+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
47065+ * we'll remove VM_MAYWRITE for good on RELRO segments.
47066+ *
47067+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
47068+ * basis because we want to allow the common case and not the special ones.
47069+ */
47070+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
47071+{
47072+ struct elfhdr elf_h;
47073+ struct elf_phdr elf_p;
47074+ unsigned long i;
47075+ unsigned long oldflags;
47076+ bool is_textrel_rw, is_textrel_rx, is_relro;
47077+
47078+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
47079+ return;
47080+
47081+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
47082+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
47083+
47084+#ifdef CONFIG_PAX_ELFRELOCS
47085+ /* possible TEXTREL */
47086+ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
47087+ 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);
47088+#else
47089+ is_textrel_rw = false;
47090+ is_textrel_rx = false;
47091+#endif
47092+
47093+ /* possible RELRO */
47094+ is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
47095+
47096+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
47097+ return;
47098+
47099+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
47100+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
47101+
47102+#ifdef CONFIG_PAX_ETEXECRELOCS
47103+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
47104+#else
47105+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
47106+#endif
47107+
47108+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
47109+ !elf_check_arch(&elf_h) ||
47110+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
47111+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
47112+ return;
47113+
47114+ for (i = 0UL; i < elf_h.e_phnum; i++) {
47115+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
47116+ return;
47117+ switch (elf_p.p_type) {
47118+ case PT_DYNAMIC:
47119+ if (!is_textrel_rw && !is_textrel_rx)
47120+ continue;
47121+ i = 0UL;
47122+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
47123+ elf_dyn dyn;
47124+
47125+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
47126+ return;
47127+ if (dyn.d_tag == DT_NULL)
47128+ return;
47129+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
47130+ gr_log_textrel(vma);
47131+ if (is_textrel_rw)
47132+ vma->vm_flags |= VM_MAYWRITE;
47133+ else
47134+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
47135+ vma->vm_flags &= ~VM_MAYWRITE;
47136+ return;
47137+ }
47138+ i++;
47139+ }
47140+ return;
47141+
47142+ case PT_GNU_RELRO:
47143+ if (!is_relro)
47144+ continue;
47145+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
47146+ vma->vm_flags &= ~VM_MAYWRITE;
47147+ return;
47148+ }
47149+ }
47150+}
47151+#endif
47152+
47153 static int __init init_elf_binfmt(void)
47154 {
47155 return register_binfmt(&elf_format);
47156diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
47157index ca88c46..f155a60 100644
47158--- a/fs/binfmt_flat.c
47159+++ b/fs/binfmt_flat.c
47160@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_binprm * bprm,
47161 realdatastart = (unsigned long) -ENOMEM;
47162 printk("Unable to allocate RAM for process data, errno %d\n",
47163 (int)-realdatastart);
47164+ down_write(&current->mm->mmap_sem);
47165 do_munmap(current->mm, textpos, text_len);
47166+ up_write(&current->mm->mmap_sem);
47167 ret = realdatastart;
47168 goto err;
47169 }
47170@@ -588,8 +590,10 @@ static int load_flat_file(struct linux_binprm * bprm,
47171 }
47172 if (IS_ERR_VALUE(result)) {
47173 printk("Unable to read data+bss, errno %d\n", (int)-result);
47174+ down_write(&current->mm->mmap_sem);
47175 do_munmap(current->mm, textpos, text_len);
47176 do_munmap(current->mm, realdatastart, data_len + extra);
47177+ up_write(&current->mm->mmap_sem);
47178 ret = result;
47179 goto err;
47180 }
47181@@ -658,8 +662,10 @@ static int load_flat_file(struct linux_binprm * bprm,
47182 }
47183 if (IS_ERR_VALUE(result)) {
47184 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
47185+ down_write(&current->mm->mmap_sem);
47186 do_munmap(current->mm, textpos, text_len + data_len + extra +
47187 MAX_SHARED_LIBS * sizeof(unsigned long));
47188+ up_write(&current->mm->mmap_sem);
47189 ret = result;
47190 goto err;
47191 }
47192diff --git a/fs/bio.c b/fs/bio.c
47193index e696713..83de133 100644
47194--- a/fs/bio.c
47195+++ b/fs/bio.c
47196@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_create_slab(unsigned int extra_size)
47197
47198 i = 0;
47199 while (i < bio_slab_nr) {
47200- struct bio_slab *bslab = &bio_slabs[i];
47201+ bslab = &bio_slabs[i];
47202
47203 if (!bslab->slab && entry == -1)
47204 entry = i;
47205@@ -1236,7 +1236,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
47206 const int read = bio_data_dir(bio) == READ;
47207 struct bio_map_data *bmd = bio->bi_private;
47208 int i;
47209- char *p = bmd->sgvecs[0].iov_base;
47210+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
47211
47212 __bio_for_each_segment(bvec, bio, i, 0) {
47213 char *addr = page_address(bvec->bv_page);
47214diff --git a/fs/block_dev.c b/fs/block_dev.c
47215index e65efa2..04fae57 100644
47216--- a/fs/block_dev.c
47217+++ b/fs/block_dev.c
47218@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, void *holder)
47219 else if (bdev->bd_contains == bdev)
47220 res = 0; /* is a whole device which isn't held */
47221
47222- else if (bdev->bd_contains->bd_holder == bd_claim)
47223+ else if (bdev->bd_contains->bd_holder == (void *)bd_claim)
47224 res = 0; /* is a partition of a device that is being partitioned */
47225 else if (bdev->bd_contains->bd_holder != NULL)
47226 res = -EBUSY; /* is a partition of a held device */
47227diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
47228index c4bc570..42acd8d 100644
47229--- a/fs/btrfs/ctree.c
47230+++ b/fs/btrfs/ctree.c
47231@@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
47232 free_extent_buffer(buf);
47233 add_root_to_dirty_list(root);
47234 } else {
47235- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
47236- parent_start = parent->start;
47237- else
47238+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
47239+ if (parent)
47240+ parent_start = parent->start;
47241+ else
47242+ parent_start = 0;
47243+ } else
47244 parent_start = 0;
47245
47246 WARN_ON(trans->transid != btrfs_header_generation(parent));
47247@@ -3645,7 +3648,6 @@ setup_items_for_insert(struct btrfs_trans_handle *trans,
47248
47249 ret = 0;
47250 if (slot == 0) {
47251- struct btrfs_disk_key disk_key;
47252 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
47253 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
47254 }
47255diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
47256index f447188..59c17c5 100644
47257--- a/fs/btrfs/disk-io.c
47258+++ b/fs/btrfs/disk-io.c
47259@@ -39,7 +39,7 @@
47260 #include "tree-log.h"
47261 #include "free-space-cache.h"
47262
47263-static struct extent_io_ops btree_extent_io_ops;
47264+static const struct extent_io_ops btree_extent_io_ops;
47265 static void end_workqueue_fn(struct btrfs_work *work);
47266 static void free_fs_root(struct btrfs_root *root);
47267
47268@@ -2607,7 +2607,7 @@ out:
47269 return 0;
47270 }
47271
47272-static struct extent_io_ops btree_extent_io_ops = {
47273+static const struct extent_io_ops btree_extent_io_ops = {
47274 .write_cache_pages_lock_hook = btree_lock_page_hook,
47275 .readpage_end_io_hook = btree_readpage_end_io_hook,
47276 .submit_bio_hook = btree_submit_bio_hook,
47277diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
47278index 559f724..a026171 100644
47279--- a/fs/btrfs/extent-tree.c
47280+++ b/fs/btrfs/extent-tree.c
47281@@ -7141,6 +7141,10 @@ static noinline int relocate_one_extent(struct btrfs_root *extent_root,
47282 u64 group_start = group->key.objectid;
47283 new_extents = kmalloc(sizeof(*new_extents),
47284 GFP_NOFS);
47285+ if (!new_extents) {
47286+ ret = -ENOMEM;
47287+ goto out;
47288+ }
47289 nr_extents = 1;
47290 ret = get_new_locations(reloc_inode,
47291 extent_key,
47292diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
47293index 36de250..7ec75c7 100644
47294--- a/fs/btrfs/extent_io.h
47295+++ b/fs/btrfs/extent_io.h
47296@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(struct inode *inode, int rw,
47297 struct bio *bio, int mirror_num,
47298 unsigned long bio_flags);
47299 struct extent_io_ops {
47300- int (*fill_delalloc)(struct inode *inode, struct page *locked_page,
47301+ int (* const fill_delalloc)(struct inode *inode, struct page *locked_page,
47302 u64 start, u64 end, int *page_started,
47303 unsigned long *nr_written);
47304- int (*writepage_start_hook)(struct page *page, u64 start, u64 end);
47305- int (*writepage_io_hook)(struct page *page, u64 start, u64 end);
47306+ int (* const writepage_start_hook)(struct page *page, u64 start, u64 end);
47307+ int (* const writepage_io_hook)(struct page *page, u64 start, u64 end);
47308 extent_submit_bio_hook_t *submit_bio_hook;
47309- int (*merge_bio_hook)(struct page *page, unsigned long offset,
47310+ int (* const merge_bio_hook)(struct page *page, unsigned long offset,
47311 size_t size, struct bio *bio,
47312 unsigned long bio_flags);
47313- int (*readpage_io_hook)(struct page *page, u64 start, u64 end);
47314- int (*readpage_io_failed_hook)(struct bio *bio, struct page *page,
47315+ int (* const readpage_io_hook)(struct page *page, u64 start, u64 end);
47316+ int (* const readpage_io_failed_hook)(struct bio *bio, struct page *page,
47317 u64 start, u64 end,
47318 struct extent_state *state);
47319- int (*writepage_io_failed_hook)(struct bio *bio, struct page *page,
47320+ int (* const writepage_io_failed_hook)(struct bio *bio, struct page *page,
47321 u64 start, u64 end,
47322 struct extent_state *state);
47323- int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end,
47324+ int (* const readpage_end_io_hook)(struct page *page, u64 start, u64 end,
47325 struct extent_state *state);
47326- int (*writepage_end_io_hook)(struct page *page, u64 start, u64 end,
47327+ int (* const writepage_end_io_hook)(struct page *page, u64 start, u64 end,
47328 struct extent_state *state, int uptodate);
47329- int (*set_bit_hook)(struct inode *inode, u64 start, u64 end,
47330+ int (* const set_bit_hook)(struct inode *inode, u64 start, u64 end,
47331 unsigned long old, unsigned long bits);
47332- int (*clear_bit_hook)(struct inode *inode, struct extent_state *state,
47333+ int (* const clear_bit_hook)(struct inode *inode, struct extent_state *state,
47334 unsigned long bits);
47335- int (*merge_extent_hook)(struct inode *inode,
47336+ int (* const merge_extent_hook)(struct inode *inode,
47337 struct extent_state *new,
47338 struct extent_state *other);
47339- int (*split_extent_hook)(struct inode *inode,
47340+ int (* const split_extent_hook)(struct inode *inode,
47341 struct extent_state *orig, u64 split);
47342- int (*write_cache_pages_lock_hook)(struct page *page);
47343+ int (* const write_cache_pages_lock_hook)(struct page *page);
47344 };
47345
47346 struct extent_io_tree {
47347@@ -88,7 +88,7 @@ struct extent_io_tree {
47348 u64 dirty_bytes;
47349 spinlock_t lock;
47350 spinlock_t buffer_lock;
47351- struct extent_io_ops *ops;
47352+ const struct extent_io_ops *ops;
47353 };
47354
47355 struct extent_state {
47356diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
47357index cb2849f..3718fb4 100644
47358--- a/fs/btrfs/free-space-cache.c
47359+++ b/fs/btrfs/free-space-cache.c
47360@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group,
47361
47362 while(1) {
47363 if (entry->bytes < bytes || entry->offset < min_start) {
47364- struct rb_node *node;
47365-
47366 node = rb_next(&entry->offset_index);
47367 if (!node)
47368 break;
47369@@ -1226,7 +1224,7 @@ again:
47370 */
47371 while (entry->bitmap || found_bitmap ||
47372 (!entry->bitmap && entry->bytes < min_bytes)) {
47373- struct rb_node *node = rb_next(&entry->offset_index);
47374+ node = rb_next(&entry->offset_index);
47375
47376 if (entry->bitmap && entry->bytes > bytes + empty_size) {
47377 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
47378diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
47379index e03a836..323837e 100644
47380--- a/fs/btrfs/inode.c
47381+++ b/fs/btrfs/inode.c
47382@@ -63,7 +63,7 @@ static const struct inode_operations btrfs_file_inode_operations;
47383 static const struct address_space_operations btrfs_aops;
47384 static const struct address_space_operations btrfs_symlink_aops;
47385 static const struct file_operations btrfs_dir_file_operations;
47386-static struct extent_io_ops btrfs_extent_io_ops;
47387+static const struct extent_io_ops btrfs_extent_io_ops;
47388
47389 static struct kmem_cache *btrfs_inode_cachep;
47390 struct kmem_cache *btrfs_trans_handle_cachep;
47391@@ -925,6 +925,7 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page,
47392 1, 0, NULL, GFP_NOFS);
47393 while (start < end) {
47394 async_cow = kmalloc(sizeof(*async_cow), GFP_NOFS);
47395+ BUG_ON(!async_cow);
47396 async_cow->inode = inode;
47397 async_cow->root = root;
47398 async_cow->locked_page = locked_page;
47399@@ -4591,6 +4592,8 @@ static noinline int uncompress_inline(struct btrfs_path *path,
47400 inline_size = btrfs_file_extent_inline_item_len(leaf,
47401 btrfs_item_nr(leaf, path->slots[0]));
47402 tmp = kmalloc(inline_size, GFP_NOFS);
47403+ if (!tmp)
47404+ return -ENOMEM;
47405 ptr = btrfs_file_extent_inline_start(item);
47406
47407 read_extent_buffer(leaf, tmp, ptr, inline_size);
47408@@ -5410,7 +5413,7 @@ fail:
47409 return -ENOMEM;
47410 }
47411
47412-static int btrfs_getattr(struct vfsmount *mnt,
47413+int btrfs_getattr(struct vfsmount *mnt,
47414 struct dentry *dentry, struct kstat *stat)
47415 {
47416 struct inode *inode = dentry->d_inode;
47417@@ -5422,6 +5425,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
47418 return 0;
47419 }
47420
47421+EXPORT_SYMBOL(btrfs_getattr);
47422+
47423+dev_t get_btrfs_dev_from_inode(struct inode *inode)
47424+{
47425+ return BTRFS_I(inode)->root->anon_super.s_dev;
47426+}
47427+EXPORT_SYMBOL(get_btrfs_dev_from_inode);
47428+
47429 static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
47430 struct inode *new_dir, struct dentry *new_dentry)
47431 {
47432@@ -5972,7 +5983,7 @@ static const struct file_operations btrfs_dir_file_operations = {
47433 .fsync = btrfs_sync_file,
47434 };
47435
47436-static struct extent_io_ops btrfs_extent_io_ops = {
47437+static const struct extent_io_ops btrfs_extent_io_ops = {
47438 .fill_delalloc = run_delalloc_range,
47439 .submit_bio_hook = btrfs_submit_bio_hook,
47440 .merge_bio_hook = btrfs_merge_bio_hook,
47441diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
47442index ab7ab53..94e0781 100644
47443--- a/fs/btrfs/relocation.c
47444+++ b/fs/btrfs/relocation.c
47445@@ -884,7 +884,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
47446 }
47447 spin_unlock(&rc->reloc_root_tree.lock);
47448
47449- BUG_ON((struct btrfs_root *)node->data != root);
47450+ BUG_ON(!node || (struct btrfs_root *)node->data != root);
47451
47452 if (!del) {
47453 spin_lock(&rc->reloc_root_tree.lock);
47454diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
47455index a240b6f..4ce16ef 100644
47456--- a/fs/btrfs/sysfs.c
47457+++ b/fs/btrfs/sysfs.c
47458@@ -164,12 +164,12 @@ static void btrfs_root_release(struct kobject *kobj)
47459 complete(&root->kobj_unregister);
47460 }
47461
47462-static struct sysfs_ops btrfs_super_attr_ops = {
47463+static const struct sysfs_ops btrfs_super_attr_ops = {
47464 .show = btrfs_super_attr_show,
47465 .store = btrfs_super_attr_store,
47466 };
47467
47468-static struct sysfs_ops btrfs_root_attr_ops = {
47469+static const struct sysfs_ops btrfs_root_attr_ops = {
47470 .show = btrfs_root_attr_show,
47471 .store = btrfs_root_attr_store,
47472 };
47473diff --git a/fs/buffer.c b/fs/buffer.c
47474index 6fa5302..395d9f6 100644
47475--- a/fs/buffer.c
47476+++ b/fs/buffer.c
47477@@ -25,6 +25,7 @@
47478 #include <linux/percpu.h>
47479 #include <linux/slab.h>
47480 #include <linux/capability.h>
47481+#include <linux/security.h>
47482 #include <linux/blkdev.h>
47483 #include <linux/file.h>
47484 #include <linux/quotaops.h>
47485diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
47486index 3797e00..ce776f6 100644
47487--- a/fs/cachefiles/bind.c
47488+++ b/fs/cachefiles/bind.c
47489@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
47490 args);
47491
47492 /* start by checking things over */
47493- ASSERT(cache->fstop_percent >= 0 &&
47494- cache->fstop_percent < cache->fcull_percent &&
47495+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
47496 cache->fcull_percent < cache->frun_percent &&
47497 cache->frun_percent < 100);
47498
47499- ASSERT(cache->bstop_percent >= 0 &&
47500- cache->bstop_percent < cache->bcull_percent &&
47501+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
47502 cache->bcull_percent < cache->brun_percent &&
47503 cache->brun_percent < 100);
47504
47505diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
47506index 4618516..bb30d01 100644
47507--- a/fs/cachefiles/daemon.c
47508+++ b/fs/cachefiles/daemon.c
47509@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
47510 if (test_bit(CACHEFILES_DEAD, &cache->flags))
47511 return -EIO;
47512
47513- if (datalen < 0 || datalen > PAGE_SIZE - 1)
47514+ if (datalen > PAGE_SIZE - 1)
47515 return -EOPNOTSUPP;
47516
47517 /* drag the command string into the kernel so we can parse it */
47518@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
47519 if (args[0] != '%' || args[1] != '\0')
47520 return -EINVAL;
47521
47522- if (fstop < 0 || fstop >= cache->fcull_percent)
47523+ if (fstop >= cache->fcull_percent)
47524 return cachefiles_daemon_range_error(cache, args);
47525
47526 cache->fstop_percent = fstop;
47527@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
47528 if (args[0] != '%' || args[1] != '\0')
47529 return -EINVAL;
47530
47531- if (bstop < 0 || bstop >= cache->bcull_percent)
47532+ if (bstop >= cache->bcull_percent)
47533 return cachefiles_daemon_range_error(cache, args);
47534
47535 cache->bstop_percent = bstop;
47536diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
47537index f7c255f..fcd61de 100644
47538--- a/fs/cachefiles/internal.h
47539+++ b/fs/cachefiles/internal.h
47540@@ -56,7 +56,7 @@ struct cachefiles_cache {
47541 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
47542 struct rb_root active_nodes; /* active nodes (can't be culled) */
47543 rwlock_t active_lock; /* lock for active_nodes */
47544- atomic_t gravecounter; /* graveyard uniquifier */
47545+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
47546 unsigned frun_percent; /* when to stop culling (% files) */
47547 unsigned fcull_percent; /* when to start culling (% files) */
47548 unsigned fstop_percent; /* when to stop allocating (% files) */
47549@@ -168,19 +168,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
47550 * proc.c
47551 */
47552 #ifdef CONFIG_CACHEFILES_HISTOGRAM
47553-extern atomic_t cachefiles_lookup_histogram[HZ];
47554-extern atomic_t cachefiles_mkdir_histogram[HZ];
47555-extern atomic_t cachefiles_create_histogram[HZ];
47556+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
47557+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
47558+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
47559
47560 extern int __init cachefiles_proc_init(void);
47561 extern void cachefiles_proc_cleanup(void);
47562 static inline
47563-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
47564+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
47565 {
47566 unsigned long jif = jiffies - start_jif;
47567 if (jif >= HZ)
47568 jif = HZ - 1;
47569- atomic_inc(&histogram[jif]);
47570+ atomic_inc_unchecked(&histogram[jif]);
47571 }
47572
47573 #else
47574diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
47575index 14ac480..a62766c 100644
47576--- a/fs/cachefiles/namei.c
47577+++ b/fs/cachefiles/namei.c
47578@@ -250,7 +250,7 @@ try_again:
47579 /* first step is to make up a grave dentry in the graveyard */
47580 sprintf(nbuffer, "%08x%08x",
47581 (uint32_t) get_seconds(),
47582- (uint32_t) atomic_inc_return(&cache->gravecounter));
47583+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
47584
47585 /* do the multiway lock magic */
47586 trap = lock_rename(cache->graveyard, dir);
47587diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
47588index eccd339..4c1d995 100644
47589--- a/fs/cachefiles/proc.c
47590+++ b/fs/cachefiles/proc.c
47591@@ -14,9 +14,9 @@
47592 #include <linux/seq_file.h>
47593 #include "internal.h"
47594
47595-atomic_t cachefiles_lookup_histogram[HZ];
47596-atomic_t cachefiles_mkdir_histogram[HZ];
47597-atomic_t cachefiles_create_histogram[HZ];
47598+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
47599+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
47600+atomic_unchecked_t cachefiles_create_histogram[HZ];
47601
47602 /*
47603 * display the latency histogram
47604@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
47605 return 0;
47606 default:
47607 index = (unsigned long) v - 3;
47608- x = atomic_read(&cachefiles_lookup_histogram[index]);
47609- y = atomic_read(&cachefiles_mkdir_histogram[index]);
47610- z = atomic_read(&cachefiles_create_histogram[index]);
47611+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
47612+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
47613+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
47614 if (x == 0 && y == 0 && z == 0)
47615 return 0;
47616
47617diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
47618index a6c8c6f..5cf8517 100644
47619--- a/fs/cachefiles/rdwr.c
47620+++ b/fs/cachefiles/rdwr.c
47621@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
47622 old_fs = get_fs();
47623 set_fs(KERNEL_DS);
47624 ret = file->f_op->write(
47625- file, (const void __user *) data, len, &pos);
47626+ file, (const void __force_user *) data, len, &pos);
47627 set_fs(old_fs);
47628 kunmap(page);
47629 if (ret != len)
47630diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
47631index 42cec2a..2aba466 100644
47632--- a/fs/cifs/cifs_debug.c
47633+++ b/fs/cifs/cifs_debug.c
47634@@ -256,25 +256,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
47635 tcon = list_entry(tmp3,
47636 struct cifsTconInfo,
47637 tcon_list);
47638- atomic_set(&tcon->num_smbs_sent, 0);
47639- atomic_set(&tcon->num_writes, 0);
47640- atomic_set(&tcon->num_reads, 0);
47641- atomic_set(&tcon->num_oplock_brks, 0);
47642- atomic_set(&tcon->num_opens, 0);
47643- atomic_set(&tcon->num_posixopens, 0);
47644- atomic_set(&tcon->num_posixmkdirs, 0);
47645- atomic_set(&tcon->num_closes, 0);
47646- atomic_set(&tcon->num_deletes, 0);
47647- atomic_set(&tcon->num_mkdirs, 0);
47648- atomic_set(&tcon->num_rmdirs, 0);
47649- atomic_set(&tcon->num_renames, 0);
47650- atomic_set(&tcon->num_t2renames, 0);
47651- atomic_set(&tcon->num_ffirst, 0);
47652- atomic_set(&tcon->num_fnext, 0);
47653- atomic_set(&tcon->num_fclose, 0);
47654- atomic_set(&tcon->num_hardlinks, 0);
47655- atomic_set(&tcon->num_symlinks, 0);
47656- atomic_set(&tcon->num_locks, 0);
47657+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
47658+ atomic_set_unchecked(&tcon->num_writes, 0);
47659+ atomic_set_unchecked(&tcon->num_reads, 0);
47660+ atomic_set_unchecked(&tcon->num_oplock_brks, 0);
47661+ atomic_set_unchecked(&tcon->num_opens, 0);
47662+ atomic_set_unchecked(&tcon->num_posixopens, 0);
47663+ atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
47664+ atomic_set_unchecked(&tcon->num_closes, 0);
47665+ atomic_set_unchecked(&tcon->num_deletes, 0);
47666+ atomic_set_unchecked(&tcon->num_mkdirs, 0);
47667+ atomic_set_unchecked(&tcon->num_rmdirs, 0);
47668+ atomic_set_unchecked(&tcon->num_renames, 0);
47669+ atomic_set_unchecked(&tcon->num_t2renames, 0);
47670+ atomic_set_unchecked(&tcon->num_ffirst, 0);
47671+ atomic_set_unchecked(&tcon->num_fnext, 0);
47672+ atomic_set_unchecked(&tcon->num_fclose, 0);
47673+ atomic_set_unchecked(&tcon->num_hardlinks, 0);
47674+ atomic_set_unchecked(&tcon->num_symlinks, 0);
47675+ atomic_set_unchecked(&tcon->num_locks, 0);
47676 }
47677 }
47678 }
47679@@ -334,41 +334,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
47680 if (tcon->need_reconnect)
47681 seq_puts(m, "\tDISCONNECTED ");
47682 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
47683- atomic_read(&tcon->num_smbs_sent),
47684- atomic_read(&tcon->num_oplock_brks));
47685+ atomic_read_unchecked(&tcon->num_smbs_sent),
47686+ atomic_read_unchecked(&tcon->num_oplock_brks));
47687 seq_printf(m, "\nReads: %d Bytes: %lld",
47688- atomic_read(&tcon->num_reads),
47689+ atomic_read_unchecked(&tcon->num_reads),
47690 (long long)(tcon->bytes_read));
47691 seq_printf(m, "\nWrites: %d Bytes: %lld",
47692- atomic_read(&tcon->num_writes),
47693+ atomic_read_unchecked(&tcon->num_writes),
47694 (long long)(tcon->bytes_written));
47695 seq_printf(m, "\nFlushes: %d",
47696- atomic_read(&tcon->num_flushes));
47697+ atomic_read_unchecked(&tcon->num_flushes));
47698 seq_printf(m, "\nLocks: %d HardLinks: %d "
47699 "Symlinks: %d",
47700- atomic_read(&tcon->num_locks),
47701- atomic_read(&tcon->num_hardlinks),
47702- atomic_read(&tcon->num_symlinks));
47703+ atomic_read_unchecked(&tcon->num_locks),
47704+ atomic_read_unchecked(&tcon->num_hardlinks),
47705+ atomic_read_unchecked(&tcon->num_symlinks));
47706 seq_printf(m, "\nOpens: %d Closes: %d "
47707 "Deletes: %d",
47708- atomic_read(&tcon->num_opens),
47709- atomic_read(&tcon->num_closes),
47710- atomic_read(&tcon->num_deletes));
47711+ atomic_read_unchecked(&tcon->num_opens),
47712+ atomic_read_unchecked(&tcon->num_closes),
47713+ atomic_read_unchecked(&tcon->num_deletes));
47714 seq_printf(m, "\nPosix Opens: %d "
47715 "Posix Mkdirs: %d",
47716- atomic_read(&tcon->num_posixopens),
47717- atomic_read(&tcon->num_posixmkdirs));
47718+ atomic_read_unchecked(&tcon->num_posixopens),
47719+ atomic_read_unchecked(&tcon->num_posixmkdirs));
47720 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
47721- atomic_read(&tcon->num_mkdirs),
47722- atomic_read(&tcon->num_rmdirs));
47723+ atomic_read_unchecked(&tcon->num_mkdirs),
47724+ atomic_read_unchecked(&tcon->num_rmdirs));
47725 seq_printf(m, "\nRenames: %d T2 Renames %d",
47726- atomic_read(&tcon->num_renames),
47727- atomic_read(&tcon->num_t2renames));
47728+ atomic_read_unchecked(&tcon->num_renames),
47729+ atomic_read_unchecked(&tcon->num_t2renames));
47730 seq_printf(m, "\nFindFirst: %d FNext %d "
47731 "FClose %d",
47732- atomic_read(&tcon->num_ffirst),
47733- atomic_read(&tcon->num_fnext),
47734- atomic_read(&tcon->num_fclose));
47735+ atomic_read_unchecked(&tcon->num_ffirst),
47736+ atomic_read_unchecked(&tcon->num_fnext),
47737+ atomic_read_unchecked(&tcon->num_fclose));
47738 }
47739 }
47740 }
47741diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
47742index 1445407..68cb0dc 100644
47743--- a/fs/cifs/cifsfs.c
47744+++ b/fs/cifs/cifsfs.c
47745@@ -869,7 +869,7 @@ cifs_init_request_bufs(void)
47746 cifs_req_cachep = kmem_cache_create("cifs_request",
47747 CIFSMaxBufSize +
47748 MAX_CIFS_HDR_SIZE, 0,
47749- SLAB_HWCACHE_ALIGN, NULL);
47750+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
47751 if (cifs_req_cachep == NULL)
47752 return -ENOMEM;
47753
47754@@ -896,7 +896,7 @@ cifs_init_request_bufs(void)
47755 efficient to alloc 1 per page off the slab compared to 17K (5page)
47756 alloc of large cifs buffers even when page debugging is on */
47757 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
47758- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
47759+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
47760 NULL);
47761 if (cifs_sm_req_cachep == NULL) {
47762 mempool_destroy(cifs_req_poolp);
47763@@ -991,8 +991,8 @@ init_cifs(void)
47764 atomic_set(&bufAllocCount, 0);
47765 atomic_set(&smBufAllocCount, 0);
47766 #ifdef CONFIG_CIFS_STATS2
47767- atomic_set(&totBufAllocCount, 0);
47768- atomic_set(&totSmBufAllocCount, 0);
47769+ atomic_set_unchecked(&totBufAllocCount, 0);
47770+ atomic_set_unchecked(&totSmBufAllocCount, 0);
47771 #endif /* CONFIG_CIFS_STATS2 */
47772
47773 atomic_set(&midCount, 0);
47774diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
47775index e29581e..1c22bab 100644
47776--- a/fs/cifs/cifsglob.h
47777+++ b/fs/cifs/cifsglob.h
47778@@ -252,28 +252,28 @@ struct cifsTconInfo {
47779 __u16 Flags; /* optional support bits */
47780 enum statusEnum tidStatus;
47781 #ifdef CONFIG_CIFS_STATS
47782- atomic_t num_smbs_sent;
47783- atomic_t num_writes;
47784- atomic_t num_reads;
47785- atomic_t num_flushes;
47786- atomic_t num_oplock_brks;
47787- atomic_t num_opens;
47788- atomic_t num_closes;
47789- atomic_t num_deletes;
47790- atomic_t num_mkdirs;
47791- atomic_t num_posixopens;
47792- atomic_t num_posixmkdirs;
47793- atomic_t num_rmdirs;
47794- atomic_t num_renames;
47795- atomic_t num_t2renames;
47796- atomic_t num_ffirst;
47797- atomic_t num_fnext;
47798- atomic_t num_fclose;
47799- atomic_t num_hardlinks;
47800- atomic_t num_symlinks;
47801- atomic_t num_locks;
47802- atomic_t num_acl_get;
47803- atomic_t num_acl_set;
47804+ atomic_unchecked_t num_smbs_sent;
47805+ atomic_unchecked_t num_writes;
47806+ atomic_unchecked_t num_reads;
47807+ atomic_unchecked_t num_flushes;
47808+ atomic_unchecked_t num_oplock_brks;
47809+ atomic_unchecked_t num_opens;
47810+ atomic_unchecked_t num_closes;
47811+ atomic_unchecked_t num_deletes;
47812+ atomic_unchecked_t num_mkdirs;
47813+ atomic_unchecked_t num_posixopens;
47814+ atomic_unchecked_t num_posixmkdirs;
47815+ atomic_unchecked_t num_rmdirs;
47816+ atomic_unchecked_t num_renames;
47817+ atomic_unchecked_t num_t2renames;
47818+ atomic_unchecked_t num_ffirst;
47819+ atomic_unchecked_t num_fnext;
47820+ atomic_unchecked_t num_fclose;
47821+ atomic_unchecked_t num_hardlinks;
47822+ atomic_unchecked_t num_symlinks;
47823+ atomic_unchecked_t num_locks;
47824+ atomic_unchecked_t num_acl_get;
47825+ atomic_unchecked_t num_acl_set;
47826 #ifdef CONFIG_CIFS_STATS2
47827 unsigned long long time_writes;
47828 unsigned long long time_reads;
47829@@ -414,7 +414,7 @@ static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)
47830 }
47831
47832 #ifdef CONFIG_CIFS_STATS
47833-#define cifs_stats_inc atomic_inc
47834+#define cifs_stats_inc atomic_inc_unchecked
47835
47836 static inline void cifs_stats_bytes_written(struct cifsTconInfo *tcon,
47837 unsigned int bytes)
47838@@ -701,8 +701,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
47839 /* Various Debug counters */
47840 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
47841 #ifdef CONFIG_CIFS_STATS2
47842-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
47843-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
47844+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
47845+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
47846 #endif
47847 GLOBAL_EXTERN atomic_t smBufAllocCount;
47848 GLOBAL_EXTERN atomic_t midCount;
47849diff --git a/fs/cifs/link.c b/fs/cifs/link.c
47850index fc1e048..28b3441 100644
47851--- a/fs/cifs/link.c
47852+++ b/fs/cifs/link.c
47853@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname)
47854
47855 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
47856 {
47857- char *p = nd_get_link(nd);
47858+ const char *p = nd_get_link(nd);
47859 if (!IS_ERR(p))
47860 kfree(p);
47861 }
47862diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
47863index 95b82e8..12a538d 100644
47864--- a/fs/cifs/misc.c
47865+++ b/fs/cifs/misc.c
47866@@ -155,7 +155,7 @@ cifs_buf_get(void)
47867 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
47868 atomic_inc(&bufAllocCount);
47869 #ifdef CONFIG_CIFS_STATS2
47870- atomic_inc(&totBufAllocCount);
47871+ atomic_inc_unchecked(&totBufAllocCount);
47872 #endif /* CONFIG_CIFS_STATS2 */
47873 }
47874
47875@@ -190,7 +190,7 @@ cifs_small_buf_get(void)
47876 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
47877 atomic_inc(&smBufAllocCount);
47878 #ifdef CONFIG_CIFS_STATS2
47879- atomic_inc(&totSmBufAllocCount);
47880+ atomic_inc_unchecked(&totSmBufAllocCount);
47881 #endif /* CONFIG_CIFS_STATS2 */
47882
47883 }
47884diff --git a/fs/coda/cache.c b/fs/coda/cache.c
47885index a5bf577..6d19845 100644
47886--- a/fs/coda/cache.c
47887+++ b/fs/coda/cache.c
47888@@ -24,14 +24,14 @@
47889 #include <linux/coda_fs_i.h>
47890 #include <linux/coda_cache.h>
47891
47892-static atomic_t permission_epoch = ATOMIC_INIT(0);
47893+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
47894
47895 /* replace or extend an acl cache hit */
47896 void coda_cache_enter(struct inode *inode, int mask)
47897 {
47898 struct coda_inode_info *cii = ITOC(inode);
47899
47900- cii->c_cached_epoch = atomic_read(&permission_epoch);
47901+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
47902 if (cii->c_uid != current_fsuid()) {
47903 cii->c_uid = current_fsuid();
47904 cii->c_cached_perm = mask;
47905@@ -43,13 +43,13 @@ void coda_cache_enter(struct inode *inode, int mask)
47906 void coda_cache_clear_inode(struct inode *inode)
47907 {
47908 struct coda_inode_info *cii = ITOC(inode);
47909- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
47910+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
47911 }
47912
47913 /* remove all acl caches */
47914 void coda_cache_clear_all(struct super_block *sb)
47915 {
47916- atomic_inc(&permission_epoch);
47917+ atomic_inc_unchecked(&permission_epoch);
47918 }
47919
47920
47921@@ -61,7 +61,7 @@ int coda_cache_check(struct inode *inode, int mask)
47922
47923 hit = (mask & cii->c_cached_perm) == mask &&
47924 cii->c_uid == current_fsuid() &&
47925- cii->c_cached_epoch == atomic_read(&permission_epoch);
47926+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
47927
47928 return hit;
47929 }
47930diff --git a/fs/compat.c b/fs/compat.c
47931index d1e2411..b1eda5d 100644
47932--- a/fs/compat.c
47933+++ b/fs/compat.c
47934@@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(char __user *filename, struct compat_timeval _
47935 static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
47936 {
47937 compat_ino_t ino = stat->ino;
47938- typeof(ubuf->st_uid) uid = 0;
47939- typeof(ubuf->st_gid) gid = 0;
47940+ typeof(((struct compat_stat *)0)->st_uid) uid = 0;
47941+ typeof(((struct compat_stat *)0)->st_gid) gid = 0;
47942 int err;
47943
47944 SET_UID(uid, stat->uid);
47945@@ -533,7 +533,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
47946
47947 set_fs(KERNEL_DS);
47948 /* The __user pointer cast is valid because of the set_fs() */
47949- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
47950+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
47951 set_fs(oldfs);
47952 /* truncating is ok because it's a user address */
47953 if (!ret)
47954@@ -830,6 +830,7 @@ struct compat_old_linux_dirent {
47955
47956 struct compat_readdir_callback {
47957 struct compat_old_linux_dirent __user *dirent;
47958+ struct file * file;
47959 int result;
47960 };
47961
47962@@ -847,6 +848,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
47963 buf->result = -EOVERFLOW;
47964 return -EOVERFLOW;
47965 }
47966+
47967+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
47968+ return 0;
47969+
47970 buf->result++;
47971 dirent = buf->dirent;
47972 if (!access_ok(VERIFY_WRITE, dirent,
47973@@ -879,6 +884,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
47974
47975 buf.result = 0;
47976 buf.dirent = dirent;
47977+ buf.file = file;
47978
47979 error = vfs_readdir(file, compat_fillonedir, &buf);
47980 if (buf.result)
47981@@ -899,6 +905,7 @@ struct compat_linux_dirent {
47982 struct compat_getdents_callback {
47983 struct compat_linux_dirent __user *current_dir;
47984 struct compat_linux_dirent __user *previous;
47985+ struct file * file;
47986 int count;
47987 int error;
47988 };
47989@@ -919,6 +926,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
47990 buf->error = -EOVERFLOW;
47991 return -EOVERFLOW;
47992 }
47993+
47994+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
47995+ return 0;
47996+
47997 dirent = buf->previous;
47998 if (dirent) {
47999 if (__put_user(offset, &dirent->d_off))
48000@@ -966,6 +977,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
48001 buf.previous = NULL;
48002 buf.count = count;
48003 buf.error = 0;
48004+ buf.file = file;
48005
48006 error = vfs_readdir(file, compat_filldir, &buf);
48007 if (error >= 0)
48008@@ -987,6 +999,7 @@ out:
48009 struct compat_getdents_callback64 {
48010 struct linux_dirent64 __user *current_dir;
48011 struct linux_dirent64 __user *previous;
48012+ struct file * file;
48013 int count;
48014 int error;
48015 };
48016@@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
48017 buf->error = -EINVAL; /* only used if we fail.. */
48018 if (reclen > buf->count)
48019 return -EINVAL;
48020+
48021+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
48022+ return 0;
48023+
48024 dirent = buf->previous;
48025
48026 if (dirent) {
48027@@ -1054,13 +1071,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
48028 buf.previous = NULL;
48029 buf.count = count;
48030 buf.error = 0;
48031+ buf.file = file;
48032
48033 error = vfs_readdir(file, compat_filldir64, &buf);
48034 if (error >= 0)
48035 error = buf.error;
48036 lastdirent = buf.previous;
48037 if (lastdirent) {
48038- typeof(lastdirent->d_off) d_off = file->f_pos;
48039+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
48040 if (__put_user_unaligned(d_off, &lastdirent->d_off))
48041 error = -EFAULT;
48042 else
48043@@ -1098,7 +1116,7 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
48044 * verify all the pointers
48045 */
48046 ret = -EINVAL;
48047- if ((nr_segs > UIO_MAXIOV) || (nr_segs <= 0))
48048+ if (nr_segs > UIO_MAXIOV)
48049 goto out;
48050 if (!file->f_op)
48051 goto out;
48052@@ -1463,11 +1481,35 @@ int compat_do_execve(char * filename,
48053 compat_uptr_t __user *envp,
48054 struct pt_regs * regs)
48055 {
48056+#ifdef CONFIG_GRKERNSEC
48057+ struct file *old_exec_file;
48058+ struct acl_subject_label *old_acl;
48059+ struct rlimit old_rlim[RLIM_NLIMITS];
48060+#endif
48061 struct linux_binprm *bprm;
48062 struct file *file;
48063 struct files_struct *displaced;
48064 bool clear_in_exec;
48065 int retval;
48066+ const struct cred *cred = current_cred();
48067+
48068+ /*
48069+ * We move the actual failure in case of RLIMIT_NPROC excess from
48070+ * set*uid() to execve() because too many poorly written programs
48071+ * don't check setuid() return code. Here we additionally recheck
48072+ * whether NPROC limit is still exceeded.
48073+ */
48074+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
48075+
48076+ if ((current->flags & PF_NPROC_EXCEEDED) &&
48077+ atomic_read(&cred->user->processes) > current->signal->rlim[RLIMIT_NPROC].rlim_cur) {
48078+ retval = -EAGAIN;
48079+ goto out_ret;
48080+ }
48081+
48082+ /* We're below the limit (still or again), so we don't want to make
48083+ * further execve() calls fail. */
48084+ current->flags &= ~PF_NPROC_EXCEEDED;
48085
48086 retval = unshare_files(&displaced);
48087 if (retval)
48088@@ -1493,12 +1535,26 @@ int compat_do_execve(char * filename,
48089 if (IS_ERR(file))
48090 goto out_unmark;
48091
48092+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
48093+ retval = -EPERM;
48094+ goto out_file;
48095+ }
48096+
48097 sched_exec();
48098
48099 bprm->file = file;
48100 bprm->filename = filename;
48101 bprm->interp = filename;
48102
48103+ if (gr_process_user_ban()) {
48104+ retval = -EPERM;
48105+ goto out_file;
48106+ }
48107+
48108+ retval = -EACCES;
48109+ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt))
48110+ goto out_file;
48111+
48112 retval = bprm_mm_init(bprm);
48113 if (retval)
48114 goto out_file;
48115@@ -1528,9 +1584,40 @@ int compat_do_execve(char * filename,
48116 if (retval < 0)
48117 goto out;
48118
48119+ if (!gr_tpe_allow(file)) {
48120+ retval = -EACCES;
48121+ goto out;
48122+ }
48123+
48124+ if (gr_check_crash_exec(file)) {
48125+ retval = -EACCES;
48126+ goto out;
48127+ }
48128+
48129+ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
48130+
48131+ gr_handle_exec_args_compat(bprm, argv);
48132+
48133+#ifdef CONFIG_GRKERNSEC
48134+ old_acl = current->acl;
48135+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
48136+ old_exec_file = current->exec_file;
48137+ get_file(file);
48138+ current->exec_file = file;
48139+#endif
48140+
48141+ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
48142+ bprm->unsafe);
48143+ if (retval < 0)
48144+ goto out_fail;
48145+
48146 retval = search_binary_handler(bprm, regs);
48147 if (retval < 0)
48148- goto out;
48149+ goto out_fail;
48150+#ifdef CONFIG_GRKERNSEC
48151+ if (old_exec_file)
48152+ fput(old_exec_file);
48153+#endif
48154
48155 /* execve succeeded */
48156 current->fs->in_exec = 0;
48157@@ -1541,6 +1628,14 @@ int compat_do_execve(char * filename,
48158 put_files_struct(displaced);
48159 return retval;
48160
48161+out_fail:
48162+#ifdef CONFIG_GRKERNSEC
48163+ current->acl = old_acl;
48164+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
48165+ fput(current->exec_file);
48166+ current->exec_file = old_exec_file;
48167+#endif
48168+
48169 out:
48170 if (bprm->mm) {
48171 acct_arg_size(bprm, 0);
48172@@ -1711,6 +1806,8 @@ int compat_core_sys_select(int n, compat_ulong_t __user *inp,
48173 struct fdtable *fdt;
48174 long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
48175
48176+ pax_track_stack();
48177+
48178 if (n < 0)
48179 goto out_nofds;
48180
48181@@ -2151,7 +2248,7 @@ asmlinkage long compat_sys_nfsservctl(int cmd,
48182 oldfs = get_fs();
48183 set_fs(KERNEL_DS);
48184 /* The __user pointer casts are valid because of the set_fs() */
48185- err = sys_nfsservctl(cmd, (void __user *) karg, (void __user *) kres);
48186+ err = sys_nfsservctl(cmd, (void __force_user *) karg, (void __force_user *) kres);
48187 set_fs(oldfs);
48188
48189 if (err)
48190diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
48191index 0adced2..bbb1b0d 100644
48192--- a/fs/compat_binfmt_elf.c
48193+++ b/fs/compat_binfmt_elf.c
48194@@ -29,10 +29,12 @@
48195 #undef elfhdr
48196 #undef elf_phdr
48197 #undef elf_note
48198+#undef elf_dyn
48199 #undef elf_addr_t
48200 #define elfhdr elf32_hdr
48201 #define elf_phdr elf32_phdr
48202 #define elf_note elf32_note
48203+#define elf_dyn Elf32_Dyn
48204 #define elf_addr_t Elf32_Addr
48205
48206 /*
48207diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
48208index d84e705..d8c364c 100644
48209--- a/fs/compat_ioctl.c
48210+++ b/fs/compat_ioctl.c
48211@@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd, unsigned
48212 up = (struct compat_video_spu_palette __user *) arg;
48213 err = get_user(palp, &up->palette);
48214 err |= get_user(length, &up->length);
48215+ if (err)
48216+ return -EFAULT;
48217
48218 up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
48219 err = put_user(compat_ptr(palp), &up_native->palette);
48220@@ -1513,7 +1515,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd, unsigned long arg)
48221 return -EFAULT;
48222 if (__get_user(udata, &ss32->iomem_base))
48223 return -EFAULT;
48224- ss.iomem_base = compat_ptr(udata);
48225+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
48226 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
48227 __get_user(ss.port_high, &ss32->port_high))
48228 return -EFAULT;
48229@@ -1809,7 +1811,7 @@ static int compat_ioctl_preallocate(struct file *file, unsigned long arg)
48230 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
48231 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
48232 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
48233- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
48234+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
48235 return -EFAULT;
48236
48237 return ioctl_preallocate(file, p);
48238diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
48239index 8e48b52..f01ed91 100644
48240--- a/fs/configfs/dir.c
48241+++ b/fs/configfs/dir.c
48242@@ -1572,7 +1572,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
48243 }
48244 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
48245 struct configfs_dirent *next;
48246- const char * name;
48247+ const unsigned char * name;
48248+ char d_name[sizeof(next->s_dentry->d_iname)];
48249 int len;
48250
48251 next = list_entry(p, struct configfs_dirent,
48252@@ -1581,7 +1582,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
48253 continue;
48254
48255 name = configfs_get_name(next);
48256- len = strlen(name);
48257+ if (next->s_dentry && name == next->s_dentry->d_iname) {
48258+ len = next->s_dentry->d_name.len;
48259+ memcpy(d_name, name, len);
48260+ name = d_name;
48261+ } else
48262+ len = strlen(name);
48263 if (next->s_dentry)
48264 ino = next->s_dentry->d_inode->i_ino;
48265 else
48266diff --git a/fs/dcache.c b/fs/dcache.c
48267index 44c0aea..2529092 100644
48268--- a/fs/dcache.c
48269+++ b/fs/dcache.c
48270@@ -45,8 +45,6 @@ EXPORT_SYMBOL(dcache_lock);
48271
48272 static struct kmem_cache *dentry_cache __read_mostly;
48273
48274-#define DNAME_INLINE_LEN (sizeof(struct dentry)-offsetof(struct dentry,d_iname))
48275-
48276 /*
48277 * This is the single most critical data structure when it comes
48278 * to the dcache: the hashtable for lookups. Somebody should try
48279@@ -2319,7 +2317,7 @@ void __init vfs_caches_init(unsigned long mempages)
48280 mempages -= reserve;
48281
48282 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
48283- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
48284+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
48285
48286 dcache_init();
48287 inode_init();
48288diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
48289index 39c6ee8..dcee0f1 100644
48290--- a/fs/debugfs/inode.c
48291+++ b/fs/debugfs/inode.c
48292@@ -269,7 +269,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
48293 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
48294 {
48295 return debugfs_create_file(name,
48296+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
48297+ S_IFDIR | S_IRWXU,
48298+#else
48299 S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
48300+#endif
48301 parent, NULL, NULL);
48302 }
48303 EXPORT_SYMBOL_GPL(debugfs_create_dir);
48304diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
48305index c010ecf..a8d8c59 100644
48306--- a/fs/dlm/lockspace.c
48307+++ b/fs/dlm/lockspace.c
48308@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struct kobject *k)
48309 kfree(ls);
48310 }
48311
48312-static struct sysfs_ops dlm_attr_ops = {
48313+static const struct sysfs_ops dlm_attr_ops = {
48314 .show = dlm_attr_show,
48315 .store = dlm_attr_store,
48316 };
48317diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
48318index 7a5f1ac..205b034 100644
48319--- a/fs/ecryptfs/crypto.c
48320+++ b/fs/ecryptfs/crypto.c
48321@@ -418,17 +418,6 @@ static int ecryptfs_encrypt_extent(struct page *enc_extent_page,
48322 rc);
48323 goto out;
48324 }
48325- if (unlikely(ecryptfs_verbosity > 0)) {
48326- ecryptfs_printk(KERN_DEBUG, "Encrypting extent "
48327- "with iv:\n");
48328- ecryptfs_dump_hex(extent_iv, crypt_stat->iv_bytes);
48329- ecryptfs_printk(KERN_DEBUG, "First 8 bytes before "
48330- "encryption:\n");
48331- ecryptfs_dump_hex((char *)
48332- (page_address(page)
48333- + (extent_offset * crypt_stat->extent_size)),
48334- 8);
48335- }
48336 rc = ecryptfs_encrypt_page_offset(crypt_stat, enc_extent_page, 0,
48337 page, (extent_offset
48338 * crypt_stat->extent_size),
48339@@ -441,14 +430,6 @@ static int ecryptfs_encrypt_extent(struct page *enc_extent_page,
48340 goto out;
48341 }
48342 rc = 0;
48343- if (unlikely(ecryptfs_verbosity > 0)) {
48344- ecryptfs_printk(KERN_DEBUG, "Encrypt extent [0x%.16x]; "
48345- "rc = [%d]\n", (extent_base + extent_offset),
48346- rc);
48347- ecryptfs_printk(KERN_DEBUG, "First 8 bytes after "
48348- "encryption:\n");
48349- ecryptfs_dump_hex((char *)(page_address(enc_extent_page)), 8);
48350- }
48351 out:
48352 return rc;
48353 }
48354@@ -545,17 +526,6 @@ static int ecryptfs_decrypt_extent(struct page *page,
48355 rc);
48356 goto out;
48357 }
48358- if (unlikely(ecryptfs_verbosity > 0)) {
48359- ecryptfs_printk(KERN_DEBUG, "Decrypting extent "
48360- "with iv:\n");
48361- ecryptfs_dump_hex(extent_iv, crypt_stat->iv_bytes);
48362- ecryptfs_printk(KERN_DEBUG, "First 8 bytes before "
48363- "decryption:\n");
48364- ecryptfs_dump_hex((char *)
48365- (page_address(enc_extent_page)
48366- + (extent_offset * crypt_stat->extent_size)),
48367- 8);
48368- }
48369 rc = ecryptfs_decrypt_page_offset(crypt_stat, page,
48370 (extent_offset
48371 * crypt_stat->extent_size),
48372@@ -569,16 +539,6 @@ static int ecryptfs_decrypt_extent(struct page *page,
48373 goto out;
48374 }
48375 rc = 0;
48376- if (unlikely(ecryptfs_verbosity > 0)) {
48377- ecryptfs_printk(KERN_DEBUG, "Decrypt extent [0x%.16x]; "
48378- "rc = [%d]\n", (extent_base + extent_offset),
48379- rc);
48380- ecryptfs_printk(KERN_DEBUG, "First 8 bytes after "
48381- "decryption:\n");
48382- ecryptfs_dump_hex((char *)(page_address(page)
48383- + (extent_offset
48384- * crypt_stat->extent_size)), 8);
48385- }
48386 out:
48387 return rc;
48388 }
48389diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
48390index 88ba4d4..073f003 100644
48391--- a/fs/ecryptfs/inode.c
48392+++ b/fs/ecryptfs/inode.c
48393@@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
48394 old_fs = get_fs();
48395 set_fs(get_ds());
48396 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
48397- (char __user *)lower_buf,
48398+ (char __force_user *)lower_buf,
48399 lower_bufsiz);
48400 set_fs(old_fs);
48401 if (rc < 0)
48402@@ -706,7 +706,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
48403 }
48404 old_fs = get_fs();
48405 set_fs(get_ds());
48406- rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
48407+ rc = dentry->d_inode->i_op->readlink(dentry, (__force char __user *)buf, len);
48408 set_fs(old_fs);
48409 if (rc < 0)
48410 goto out_free;
48411diff --git a/fs/exec.c b/fs/exec.c
48412index 86fafc6..47ffa63 100644
48413--- a/fs/exec.c
48414+++ b/fs/exec.c
48415@@ -56,12 +56,28 @@
48416 #include <linux/fsnotify.h>
48417 #include <linux/fs_struct.h>
48418 #include <linux/pipe_fs_i.h>
48419+#include <linux/random.h>
48420+#include <linux/seq_file.h>
48421+
48422+#ifdef CONFIG_PAX_REFCOUNT
48423+#include <linux/kallsyms.h>
48424+#include <linux/kdebug.h>
48425+#endif
48426
48427 #include <asm/uaccess.h>
48428 #include <asm/mmu_context.h>
48429 #include <asm/tlb.h>
48430 #include "internal.h"
48431
48432+#ifndef CONFIG_PAX_HAVE_ACL_FLAGS
48433+void __weak pax_set_initial_flags(struct linux_binprm *bprm) {}
48434+#endif
48435+
48436+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
48437+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
48438+EXPORT_SYMBOL(pax_set_initial_flags_func);
48439+#endif
48440+
48441 int core_uses_pid;
48442 char core_pattern[CORENAME_MAX_SIZE] = "core";
48443 unsigned int core_pipe_limit;
48444@@ -178,18 +194,10 @@ struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
48445 int write)
48446 {
48447 struct page *page;
48448- int ret;
48449
48450-#ifdef CONFIG_STACK_GROWSUP
48451- if (write) {
48452- ret = expand_stack_downwards(bprm->vma, pos);
48453- if (ret < 0)
48454- return NULL;
48455- }
48456-#endif
48457- ret = get_user_pages(current, bprm->mm, pos,
48458- 1, write, 1, &page, NULL);
48459- if (ret <= 0)
48460+ if (0 > expand_stack_downwards(bprm->vma, pos))
48461+ return NULL;
48462+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
48463 return NULL;
48464
48465 if (write) {
48466@@ -263,6 +271,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
48467 vma->vm_end = STACK_TOP_MAX;
48468 vma->vm_start = vma->vm_end - PAGE_SIZE;
48469 vma->vm_flags = VM_STACK_FLAGS;
48470+
48471+#ifdef CONFIG_PAX_SEGMEXEC
48472+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
48473+#endif
48474+
48475 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
48476
48477 err = security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1);
48478@@ -276,6 +289,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
48479 mm->stack_vm = mm->total_vm = 1;
48480 up_write(&mm->mmap_sem);
48481 bprm->p = vma->vm_end - sizeof(void *);
48482+
48483+#ifdef CONFIG_PAX_RANDUSTACK
48484+ if (randomize_va_space)
48485+ bprm->p ^= (pax_get_random_long() & ~15) & ~PAGE_MASK;
48486+#endif
48487+
48488 return 0;
48489 err:
48490 up_write(&mm->mmap_sem);
48491@@ -510,7 +529,7 @@ int copy_strings_kernel(int argc,char ** argv, struct linux_binprm *bprm)
48492 int r;
48493 mm_segment_t oldfs = get_fs();
48494 set_fs(KERNEL_DS);
48495- r = copy_strings(argc, (char __user * __user *)argv, bprm);
48496+ r = copy_strings(argc, (__force char __user * __user *)argv, bprm);
48497 set_fs(oldfs);
48498 return r;
48499 }
48500@@ -540,7 +559,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
48501 unsigned long new_end = old_end - shift;
48502 struct mmu_gather *tlb;
48503
48504- BUG_ON(new_start > new_end);
48505+ if (new_start >= new_end || new_start < mmap_min_addr)
48506+ return -ENOMEM;
48507
48508 /*
48509 * ensure there are no vmas between where we want to go
48510@@ -549,6 +569,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
48511 if (vma != find_vma(mm, new_start))
48512 return -EFAULT;
48513
48514+#ifdef CONFIG_PAX_SEGMEXEC
48515+ BUG_ON(pax_find_mirror_vma(vma));
48516+#endif
48517+
48518 /*
48519 * cover the whole range: [new_start, old_end)
48520 */
48521@@ -630,10 +654,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
48522 stack_top = arch_align_stack(stack_top);
48523 stack_top = PAGE_ALIGN(stack_top);
48524
48525- if (unlikely(stack_top < mmap_min_addr) ||
48526- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
48527- return -ENOMEM;
48528-
48529 stack_shift = vma->vm_end - stack_top;
48530
48531 bprm->p -= stack_shift;
48532@@ -645,6 +665,14 @@ int setup_arg_pages(struct linux_binprm *bprm,
48533 bprm->exec -= stack_shift;
48534
48535 down_write(&mm->mmap_sem);
48536+
48537+ /* Move stack pages down in memory. */
48538+ if (stack_shift) {
48539+ ret = shift_arg_pages(vma, stack_shift);
48540+ if (ret)
48541+ goto out_unlock;
48542+ }
48543+
48544 vm_flags = VM_STACK_FLAGS;
48545
48546 /*
48547@@ -658,19 +686,24 @@ int setup_arg_pages(struct linux_binprm *bprm,
48548 vm_flags &= ~VM_EXEC;
48549 vm_flags |= mm->def_flags;
48550
48551+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
48552+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
48553+ vm_flags &= ~VM_EXEC;
48554+
48555+#ifdef CONFIG_PAX_MPROTECT
48556+ if (mm->pax_flags & MF_PAX_MPROTECT)
48557+ vm_flags &= ~VM_MAYEXEC;
48558+#endif
48559+
48560+ }
48561+#endif
48562+
48563 ret = mprotect_fixup(vma, &prev, vma->vm_start, vma->vm_end,
48564 vm_flags);
48565 if (ret)
48566 goto out_unlock;
48567 BUG_ON(prev != vma);
48568
48569- /* Move stack pages down in memory. */
48570- if (stack_shift) {
48571- ret = shift_arg_pages(vma, stack_shift);
48572- if (ret)
48573- goto out_unlock;
48574- }
48575-
48576 stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE;
48577 stack_size = vma->vm_end - vma->vm_start;
48578 /*
48579@@ -744,7 +777,7 @@ int kernel_read(struct file *file, loff_t offset,
48580 old_fs = get_fs();
48581 set_fs(get_ds());
48582 /* The cast to a user pointer is valid due to the set_fs() */
48583- result = vfs_read(file, (void __user *)addr, count, &pos);
48584+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
48585 set_fs(old_fs);
48586 return result;
48587 }
48588@@ -985,6 +1018,21 @@ void set_task_comm(struct task_struct *tsk, char *buf)
48589 perf_event_comm(tsk);
48590 }
48591
48592+static void filename_to_taskname(char *tcomm, const char *fn, unsigned int len)
48593+{
48594+ int i, ch;
48595+
48596+ /* Copies the binary name from after last slash */
48597+ for (i = 0; (ch = *(fn++)) != '\0';) {
48598+ if (ch == '/')
48599+ i = 0; /* overwrite what we wrote */
48600+ else
48601+ if (i < len - 1)
48602+ tcomm[i++] = ch;
48603+ }
48604+ tcomm[i] = '\0';
48605+}
48606+
48607 int flush_old_exec(struct linux_binprm * bprm)
48608 {
48609 int retval;
48610@@ -999,6 +1047,7 @@ int flush_old_exec(struct linux_binprm * bprm)
48611
48612 set_mm_exe_file(bprm->mm, bprm->file);
48613
48614+ filename_to_taskname(bprm->tcomm, bprm->filename, sizeof(bprm->tcomm));
48615 /*
48616 * Release all of the old mmap stuff
48617 */
48618@@ -1023,10 +1072,6 @@ EXPORT_SYMBOL(flush_old_exec);
48619
48620 void setup_new_exec(struct linux_binprm * bprm)
48621 {
48622- int i, ch;
48623- char * name;
48624- char tcomm[sizeof(current->comm)];
48625-
48626 arch_pick_mmap_layout(current->mm);
48627
48628 /* This is the point of no return */
48629@@ -1037,18 +1082,7 @@ void setup_new_exec(struct linux_binprm * bprm)
48630 else
48631 set_dumpable(current->mm, suid_dumpable);
48632
48633- name = bprm->filename;
48634-
48635- /* Copies the binary name from after last slash */
48636- for (i=0; (ch = *(name++)) != '\0';) {
48637- if (ch == '/')
48638- i = 0; /* overwrite what we wrote */
48639- else
48640- if (i < (sizeof(tcomm) - 1))
48641- tcomm[i++] = ch;
48642- }
48643- tcomm[i] = '\0';
48644- set_task_comm(current, tcomm);
48645+ set_task_comm(current, bprm->tcomm);
48646
48647 /* Set the new mm task size. We have to do that late because it may
48648 * depend on TIF_32BIT which is only updated in flush_thread() on
48649@@ -1152,7 +1186,7 @@ int check_unsafe_exec(struct linux_binprm *bprm)
48650 }
48651 rcu_read_unlock();
48652
48653- if (p->fs->users > n_fs) {
48654+ if (atomic_read(&p->fs->users) > n_fs) {
48655 bprm->unsafe |= LSM_UNSAFE_SHARE;
48656 } else {
48657 res = -EAGAIN;
48658@@ -1339,6 +1373,10 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
48659
48660 EXPORT_SYMBOL(search_binary_handler);
48661
48662+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48663+atomic64_unchecked_t global_exec_counter = ATOMIC64_INIT(0);
48664+#endif
48665+
48666 /*
48667 * sys_execve() executes a new program.
48668 */
48669@@ -1347,11 +1385,35 @@ int do_execve(char * filename,
48670 char __user *__user *envp,
48671 struct pt_regs * regs)
48672 {
48673+#ifdef CONFIG_GRKERNSEC
48674+ struct file *old_exec_file;
48675+ struct acl_subject_label *old_acl;
48676+ struct rlimit old_rlim[RLIM_NLIMITS];
48677+#endif
48678 struct linux_binprm *bprm;
48679 struct file *file;
48680 struct files_struct *displaced;
48681 bool clear_in_exec;
48682 int retval;
48683+ const struct cred *cred = current_cred();
48684+
48685+ /*
48686+ * We move the actual failure in case of RLIMIT_NPROC excess from
48687+ * set*uid() to execve() because too many poorly written programs
48688+ * don't check setuid() return code. Here we additionally recheck
48689+ * whether NPROC limit is still exceeded.
48690+ */
48691+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
48692+
48693+ if ((current->flags & PF_NPROC_EXCEEDED) &&
48694+ atomic_read(&cred->user->processes) > current->signal->rlim[RLIMIT_NPROC].rlim_cur) {
48695+ retval = -EAGAIN;
48696+ goto out_ret;
48697+ }
48698+
48699+ /* We're below the limit (still or again), so we don't want to make
48700+ * further execve() calls fail. */
48701+ current->flags &= ~PF_NPROC_EXCEEDED;
48702
48703 retval = unshare_files(&displaced);
48704 if (retval)
48705@@ -1377,12 +1439,27 @@ int do_execve(char * filename,
48706 if (IS_ERR(file))
48707 goto out_unmark;
48708
48709+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
48710+ retval = -EPERM;
48711+ goto out_file;
48712+ }
48713+
48714 sched_exec();
48715
48716 bprm->file = file;
48717 bprm->filename = filename;
48718 bprm->interp = filename;
48719
48720+ if (gr_process_user_ban()) {
48721+ retval = -EPERM;
48722+ goto out_file;
48723+ }
48724+
48725+ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
48726+ retval = -EACCES;
48727+ goto out_file;
48728+ }
48729+
48730 retval = bprm_mm_init(bprm);
48731 if (retval)
48732 goto out_file;
48733@@ -1412,12 +1489,47 @@ int do_execve(char * filename,
48734 if (retval < 0)
48735 goto out;
48736
48737+ if (!gr_tpe_allow(file)) {
48738+ retval = -EACCES;
48739+ goto out;
48740+ }
48741+
48742+ if (gr_check_crash_exec(file)) {
48743+ retval = -EACCES;
48744+ goto out;
48745+ }
48746+
48747+ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
48748+
48749+ gr_handle_exec_args(bprm, (const char __user *const __user *)argv);
48750+
48751+#ifdef CONFIG_GRKERNSEC
48752+ old_acl = current->acl;
48753+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
48754+ old_exec_file = current->exec_file;
48755+ get_file(file);
48756+ current->exec_file = file;
48757+#endif
48758+
48759+ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
48760+ bprm->unsafe);
48761+ if (retval < 0)
48762+ goto out_fail;
48763+
48764 current->flags &= ~PF_KTHREAD;
48765 retval = search_binary_handler(bprm,regs);
48766 if (retval < 0)
48767- goto out;
48768+ goto out_fail;
48769+#ifdef CONFIG_GRKERNSEC
48770+ if (old_exec_file)
48771+ fput(old_exec_file);
48772+#endif
48773
48774 /* execve succeeded */
48775+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48776+ current->exec_id = atomic64_inc_return_unchecked(&global_exec_counter);
48777+#endif
48778+
48779 current->fs->in_exec = 0;
48780 current->in_execve = 0;
48781 acct_update_integrals(current);
48782@@ -1426,6 +1538,14 @@ int do_execve(char * filename,
48783 put_files_struct(displaced);
48784 return retval;
48785
48786+out_fail:
48787+#ifdef CONFIG_GRKERNSEC
48788+ current->acl = old_acl;
48789+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
48790+ fput(current->exec_file);
48791+ current->exec_file = old_exec_file;
48792+#endif
48793+
48794 out:
48795 if (bprm->mm) {
48796 acct_arg_size(bprm, 0);
48797@@ -1591,6 +1711,220 @@ out:
48798 return ispipe;
48799 }
48800
48801+int pax_check_flags(unsigned long *flags)
48802+{
48803+ int retval = 0;
48804+
48805+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
48806+ if (*flags & MF_PAX_SEGMEXEC)
48807+ {
48808+ *flags &= ~MF_PAX_SEGMEXEC;
48809+ retval = -EINVAL;
48810+ }
48811+#endif
48812+
48813+ if ((*flags & MF_PAX_PAGEEXEC)
48814+
48815+#ifdef CONFIG_PAX_PAGEEXEC
48816+ && (*flags & MF_PAX_SEGMEXEC)
48817+#endif
48818+
48819+ )
48820+ {
48821+ *flags &= ~MF_PAX_PAGEEXEC;
48822+ retval = -EINVAL;
48823+ }
48824+
48825+ if ((*flags & MF_PAX_MPROTECT)
48826+
48827+#ifdef CONFIG_PAX_MPROTECT
48828+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
48829+#endif
48830+
48831+ )
48832+ {
48833+ *flags &= ~MF_PAX_MPROTECT;
48834+ retval = -EINVAL;
48835+ }
48836+
48837+ if ((*flags & MF_PAX_EMUTRAMP)
48838+
48839+#ifdef CONFIG_PAX_EMUTRAMP
48840+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
48841+#endif
48842+
48843+ )
48844+ {
48845+ *flags &= ~MF_PAX_EMUTRAMP;
48846+ retval = -EINVAL;
48847+ }
48848+
48849+ return retval;
48850+}
48851+
48852+EXPORT_SYMBOL(pax_check_flags);
48853+
48854+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
48855+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
48856+{
48857+ struct task_struct *tsk = current;
48858+ struct mm_struct *mm = current->mm;
48859+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
48860+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
48861+ char *path_exec = NULL;
48862+ char *path_fault = NULL;
48863+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
48864+
48865+ if (buffer_exec && buffer_fault) {
48866+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
48867+
48868+ down_read(&mm->mmap_sem);
48869+ vma = mm->mmap;
48870+ while (vma && (!vma_exec || !vma_fault)) {
48871+ if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
48872+ vma_exec = vma;
48873+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
48874+ vma_fault = vma;
48875+ vma = vma->vm_next;
48876+ }
48877+ if (vma_exec) {
48878+ path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
48879+ if (IS_ERR(path_exec))
48880+ path_exec = "<path too long>";
48881+ else {
48882+ path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
48883+ if (path_exec) {
48884+ *path_exec = 0;
48885+ path_exec = buffer_exec;
48886+ } else
48887+ path_exec = "<path too long>";
48888+ }
48889+ }
48890+ if (vma_fault) {
48891+ start = vma_fault->vm_start;
48892+ end = vma_fault->vm_end;
48893+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
48894+ if (vma_fault->vm_file) {
48895+ path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
48896+ if (IS_ERR(path_fault))
48897+ path_fault = "<path too long>";
48898+ else {
48899+ path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
48900+ if (path_fault) {
48901+ *path_fault = 0;
48902+ path_fault = buffer_fault;
48903+ } else
48904+ path_fault = "<path too long>";
48905+ }
48906+ } else
48907+ path_fault = "<anonymous mapping>";
48908+ }
48909+ up_read(&mm->mmap_sem);
48910+ }
48911+ if (tsk->signal->curr_ip)
48912+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
48913+ else
48914+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
48915+ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
48916+ "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
48917+ task_uid(tsk), task_euid(tsk), pc, sp);
48918+ free_page((unsigned long)buffer_exec);
48919+ free_page((unsigned long)buffer_fault);
48920+ pax_report_insns(regs, pc, sp);
48921+ do_coredump(SIGKILL, SIGKILL, regs);
48922+}
48923+#endif
48924+
48925+#ifdef CONFIG_PAX_REFCOUNT
48926+void pax_report_refcount_overflow(struct pt_regs *regs)
48927+{
48928+ if (current->signal->curr_ip)
48929+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
48930+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
48931+ else
48932+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
48933+ current->comm, task_pid_nr(current), current_uid(), current_euid());
48934+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
48935+ show_regs(regs);
48936+ force_sig_specific(SIGKILL, current);
48937+}
48938+#endif
48939+
48940+#ifdef CONFIG_PAX_USERCOPY
48941+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
48942+int object_is_on_stack(const void *obj, unsigned long len)
48943+{
48944+ const void * const stack = task_stack_page(current);
48945+ const void * const stackend = stack + THREAD_SIZE;
48946+
48947+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
48948+ const void *frame = NULL;
48949+ const void *oldframe;
48950+#endif
48951+
48952+ if (obj + len < obj)
48953+ return -1;
48954+
48955+ if (obj + len <= stack || stackend <= obj)
48956+ return 0;
48957+
48958+ if (obj < stack || stackend < obj + len)
48959+ return -1;
48960+
48961+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
48962+ oldframe = __builtin_frame_address(1);
48963+ if (oldframe)
48964+ frame = __builtin_frame_address(2);
48965+ /*
48966+ low ----------------------------------------------> high
48967+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
48968+ ^----------------^
48969+ allow copies only within here
48970+ */
48971+ while (stack <= frame && frame < stackend) {
48972+ /* if obj + len extends past the last frame, this
48973+ check won't pass and the next frame will be 0,
48974+ causing us to bail out and correctly report
48975+ the copy as invalid
48976+ */
48977+ if (obj + len <= frame)
48978+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
48979+ oldframe = frame;
48980+ frame = *(const void * const *)frame;
48981+ }
48982+ return -1;
48983+#else
48984+ return 1;
48985+#endif
48986+}
48987+
48988+
48989+NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
48990+{
48991+ if (current->signal->curr_ip)
48992+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
48993+ &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
48994+ else
48995+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
48996+ to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
48997+
48998+ dump_stack();
48999+ gr_handle_kernel_exploit();
49000+ do_group_exit(SIGKILL);
49001+}
49002+#endif
49003+
49004+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
49005+void pax_track_stack(void)
49006+{
49007+ unsigned long sp = (unsigned long)&sp;
49008+ if (sp < current_thread_info()->lowest_stack &&
49009+ sp > (unsigned long)task_stack_page(current))
49010+ current_thread_info()->lowest_stack = sp;
49011+}
49012+EXPORT_SYMBOL(pax_track_stack);
49013+#endif
49014+
49015 static int zap_process(struct task_struct *start)
49016 {
49017 struct task_struct *t;
49018@@ -1793,17 +2127,17 @@ static void wait_for_dump_helpers(struct file *file)
49019 pipe = file->f_path.dentry->d_inode->i_pipe;
49020
49021 pipe_lock(pipe);
49022- pipe->readers++;
49023- pipe->writers--;
49024+ atomic_inc(&pipe->readers);
49025+ atomic_dec(&pipe->writers);
49026
49027- while ((pipe->readers > 1) && (!signal_pending(current))) {
49028+ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
49029 wake_up_interruptible_sync(&pipe->wait);
49030 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
49031 pipe_wait(pipe);
49032 }
49033
49034- pipe->readers--;
49035- pipe->writers++;
49036+ atomic_dec(&pipe->readers);
49037+ atomic_inc(&pipe->writers);
49038 pipe_unlock(pipe);
49039
49040 }
49041@@ -1826,10 +2160,13 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
49042 char **helper_argv = NULL;
49043 int helper_argc = 0;
49044 int dump_count = 0;
49045- static atomic_t core_dump_count = ATOMIC_INIT(0);
49046+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
49047
49048 audit_core_dumps(signr);
49049
49050+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
49051+ gr_handle_brute_attach(current, mm->flags);
49052+
49053 binfmt = mm->binfmt;
49054 if (!binfmt || !binfmt->core_dump)
49055 goto fail;
49056@@ -1874,6 +2211,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
49057 */
49058 clear_thread_flag(TIF_SIGPENDING);
49059
49060+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
49061+
49062 /*
49063 * lock_kernel() because format_corename() is controlled by sysctl, which
49064 * uses lock_kernel()
49065@@ -1908,7 +2247,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
49066 goto fail_unlock;
49067 }
49068
49069- dump_count = atomic_inc_return(&core_dump_count);
49070+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
49071 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
49072 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
49073 task_tgid_vnr(current), current->comm);
49074@@ -1972,7 +2311,7 @@ close_fail:
49075 filp_close(file, NULL);
49076 fail_dropcount:
49077 if (dump_count)
49078- atomic_dec(&core_dump_count);
49079+ atomic_dec_unchecked(&core_dump_count);
49080 fail_unlock:
49081 if (helper_argv)
49082 argv_free(helper_argv);
49083diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
49084index 7f8d2e5..a1abdbb 100644
49085--- a/fs/ext2/balloc.c
49086+++ b/fs/ext2/balloc.c
49087@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
49088
49089 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
49090 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
49091- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
49092+ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
49093 sbi->s_resuid != current_fsuid() &&
49094 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
49095 return 0;
49096diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
49097index 27967f9..9f2a5fb 100644
49098--- a/fs/ext3/balloc.c
49099+++ b/fs/ext3/balloc.c
49100@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi)
49101
49102 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
49103 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
49104- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
49105+ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
49106 sbi->s_resuid != current_fsuid() &&
49107 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
49108 return 0;
49109diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
49110index e85b63c..80398e6 100644
49111--- a/fs/ext4/balloc.c
49112+++ b/fs/ext4/balloc.c
49113@@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks)
49114 /* Hm, nope. Are (enough) root reserved blocks available? */
49115 if (sbi->s_resuid == current_fsuid() ||
49116 ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
49117- capable(CAP_SYS_RESOURCE)) {
49118+ capable_nolog(CAP_SYS_RESOURCE)) {
49119 if (free_blocks >= (nblocks + dirty_blocks))
49120 return 1;
49121 }
49122diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
49123index 67c46ed..1f237e5 100644
49124--- a/fs/ext4/ext4.h
49125+++ b/fs/ext4/ext4.h
49126@@ -1077,19 +1077,19 @@ struct ext4_sb_info {
49127
49128 /* stats for buddy allocator */
49129 spinlock_t s_mb_pa_lock;
49130- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
49131- atomic_t s_bal_success; /* we found long enough chunks */
49132- atomic_t s_bal_allocated; /* in blocks */
49133- atomic_t s_bal_ex_scanned; /* total extents scanned */
49134- atomic_t s_bal_goals; /* goal hits */
49135- atomic_t s_bal_breaks; /* too long searches */
49136- atomic_t s_bal_2orders; /* 2^order hits */
49137+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
49138+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
49139+ atomic_unchecked_t s_bal_allocated; /* in blocks */
49140+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
49141+ atomic_unchecked_t s_bal_goals; /* goal hits */
49142+ atomic_unchecked_t s_bal_breaks; /* too long searches */
49143+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
49144 spinlock_t s_bal_lock;
49145 unsigned long s_mb_buddies_generated;
49146 unsigned long long s_mb_generation_time;
49147- atomic_t s_mb_lost_chunks;
49148- atomic_t s_mb_preallocated;
49149- atomic_t s_mb_discarded;
49150+ atomic_unchecked_t s_mb_lost_chunks;
49151+ atomic_unchecked_t s_mb_preallocated;
49152+ atomic_unchecked_t s_mb_discarded;
49153 atomic_t s_lock_busy;
49154
49155 /* locality groups */
49156diff --git a/fs/ext4/file.c b/fs/ext4/file.c
49157index 2a60541..7439d61 100644
49158--- a/fs/ext4/file.c
49159+++ b/fs/ext4/file.c
49160@@ -122,8 +122,8 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
49161 cp = d_path(&path, buf, sizeof(buf));
49162 path_put(&path);
49163 if (!IS_ERR(cp)) {
49164- memcpy(sbi->s_es->s_last_mounted, cp,
49165- sizeof(sbi->s_es->s_last_mounted));
49166+ strlcpy(sbi->s_es->s_last_mounted, cp,
49167+ sizeof(sbi->s_es->s_last_mounted));
49168 sb->s_dirt = 1;
49169 }
49170 }
49171diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
49172index 42bac1b..0aab9d8 100644
49173--- a/fs/ext4/mballoc.c
49174+++ b/fs/ext4/mballoc.c
49175@@ -1755,7 +1755,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
49176 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
49177
49178 if (EXT4_SB(sb)->s_mb_stats)
49179- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
49180+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
49181
49182 break;
49183 }
49184@@ -2131,7 +2131,7 @@ repeat:
49185 ac->ac_status = AC_STATUS_CONTINUE;
49186 ac->ac_flags |= EXT4_MB_HINT_FIRST;
49187 cr = 3;
49188- atomic_inc(&sbi->s_mb_lost_chunks);
49189+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
49190 goto repeat;
49191 }
49192 }
49193@@ -2174,6 +2174,8 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
49194 ext4_grpblk_t counters[16];
49195 } sg;
49196
49197+ pax_track_stack();
49198+
49199 group--;
49200 if (group == 0)
49201 seq_printf(seq, "#%-5s: %-5s %-5s %-5s "
49202@@ -2534,25 +2536,25 @@ int ext4_mb_release(struct super_block *sb)
49203 if (sbi->s_mb_stats) {
49204 printk(KERN_INFO
49205 "EXT4-fs: mballoc: %u blocks %u reqs (%u success)\n",
49206- atomic_read(&sbi->s_bal_allocated),
49207- atomic_read(&sbi->s_bal_reqs),
49208- atomic_read(&sbi->s_bal_success));
49209+ atomic_read_unchecked(&sbi->s_bal_allocated),
49210+ atomic_read_unchecked(&sbi->s_bal_reqs),
49211+ atomic_read_unchecked(&sbi->s_bal_success));
49212 printk(KERN_INFO
49213 "EXT4-fs: mballoc: %u extents scanned, %u goal hits, "
49214 "%u 2^N hits, %u breaks, %u lost\n",
49215- atomic_read(&sbi->s_bal_ex_scanned),
49216- atomic_read(&sbi->s_bal_goals),
49217- atomic_read(&sbi->s_bal_2orders),
49218- atomic_read(&sbi->s_bal_breaks),
49219- atomic_read(&sbi->s_mb_lost_chunks));
49220+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
49221+ atomic_read_unchecked(&sbi->s_bal_goals),
49222+ atomic_read_unchecked(&sbi->s_bal_2orders),
49223+ atomic_read_unchecked(&sbi->s_bal_breaks),
49224+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
49225 printk(KERN_INFO
49226 "EXT4-fs: mballoc: %lu generated and it took %Lu\n",
49227 sbi->s_mb_buddies_generated++,
49228 sbi->s_mb_generation_time);
49229 printk(KERN_INFO
49230 "EXT4-fs: mballoc: %u preallocated, %u discarded\n",
49231- atomic_read(&sbi->s_mb_preallocated),
49232- atomic_read(&sbi->s_mb_discarded));
49233+ atomic_read_unchecked(&sbi->s_mb_preallocated),
49234+ atomic_read_unchecked(&sbi->s_mb_discarded));
49235 }
49236
49237 free_percpu(sbi->s_locality_groups);
49238@@ -3034,16 +3036,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
49239 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
49240
49241 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
49242- atomic_inc(&sbi->s_bal_reqs);
49243- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
49244+ atomic_inc_unchecked(&sbi->s_bal_reqs);
49245+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
49246 if (ac->ac_o_ex.fe_len >= ac->ac_g_ex.fe_len)
49247- atomic_inc(&sbi->s_bal_success);
49248- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
49249+ atomic_inc_unchecked(&sbi->s_bal_success);
49250+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
49251 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
49252 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
49253- atomic_inc(&sbi->s_bal_goals);
49254+ atomic_inc_unchecked(&sbi->s_bal_goals);
49255 if (ac->ac_found > sbi->s_mb_max_to_scan)
49256- atomic_inc(&sbi->s_bal_breaks);
49257+ atomic_inc_unchecked(&sbi->s_bal_breaks);
49258 }
49259
49260 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
49261@@ -3443,7 +3445,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
49262 trace_ext4_mb_new_inode_pa(ac, pa);
49263
49264 ext4_mb_use_inode_pa(ac, pa);
49265- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
49266+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
49267
49268 ei = EXT4_I(ac->ac_inode);
49269 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
49270@@ -3503,7 +3505,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
49271 trace_ext4_mb_new_group_pa(ac, pa);
49272
49273 ext4_mb_use_group_pa(ac, pa);
49274- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
49275+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
49276
49277 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
49278 lg = ac->ac_lg;
49279@@ -3607,7 +3609,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
49280 * from the bitmap and continue.
49281 */
49282 }
49283- atomic_add(free, &sbi->s_mb_discarded);
49284+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
49285
49286 return err;
49287 }
49288@@ -3626,7 +3628,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
49289 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
49290 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
49291 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
49292- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
49293+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
49294
49295 if (ac) {
49296 ac->ac_sb = sb;
49297diff --git a/fs/ext4/super.c b/fs/ext4/super.c
49298index f1e7077..edd86b2 100644
49299--- a/fs/ext4/super.c
49300+++ b/fs/ext4/super.c
49301@@ -2286,7 +2286,7 @@ static void ext4_sb_release(struct kobject *kobj)
49302 }
49303
49304
49305-static struct sysfs_ops ext4_attr_ops = {
49306+static const struct sysfs_ops ext4_attr_ops = {
49307 .show = ext4_attr_show,
49308 .store = ext4_attr_store,
49309 };
49310diff --git a/fs/fcntl.c b/fs/fcntl.c
49311index 97e01dc..e9aab2d 100644
49312--- a/fs/fcntl.c
49313+++ b/fs/fcntl.c
49314@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
49315 if (err)
49316 return err;
49317
49318+ if (gr_handle_chroot_fowner(pid, type))
49319+ return -ENOENT;
49320+ if (gr_check_protected_task_fowner(pid, type))
49321+ return -EACCES;
49322+
49323 f_modown(filp, pid, type, force);
49324 return 0;
49325 }
49326@@ -265,7 +270,7 @@ pid_t f_getown(struct file *filp)
49327
49328 static int f_setown_ex(struct file *filp, unsigned long arg)
49329 {
49330- struct f_owner_ex * __user owner_p = (void * __user)arg;
49331+ struct f_owner_ex __user *owner_p = (void __user *)arg;
49332 struct f_owner_ex owner;
49333 struct pid *pid;
49334 int type;
49335@@ -305,7 +310,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
49336
49337 static int f_getown_ex(struct file *filp, unsigned long arg)
49338 {
49339- struct f_owner_ex * __user owner_p = (void * __user)arg;
49340+ struct f_owner_ex __user *owner_p = (void __user *)arg;
49341 struct f_owner_ex owner;
49342 int ret = 0;
49343
49344@@ -344,6 +349,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
49345 switch (cmd) {
49346 case F_DUPFD:
49347 case F_DUPFD_CLOEXEC:
49348+ gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
49349 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
49350 break;
49351 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
49352diff --git a/fs/fifo.c b/fs/fifo.c
49353index f8f97b8..b1f2259 100644
49354--- a/fs/fifo.c
49355+++ b/fs/fifo.c
49356@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
49357 */
49358 filp->f_op = &read_pipefifo_fops;
49359 pipe->r_counter++;
49360- if (pipe->readers++ == 0)
49361+ if (atomic_inc_return(&pipe->readers) == 1)
49362 wake_up_partner(inode);
49363
49364- if (!pipe->writers) {
49365+ if (!atomic_read(&pipe->writers)) {
49366 if ((filp->f_flags & O_NONBLOCK)) {
49367 /* suppress POLLHUP until we have
49368 * seen a writer */
49369@@ -83,15 +83,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
49370 * errno=ENXIO when there is no process reading the FIFO.
49371 */
49372 ret = -ENXIO;
49373- if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
49374+ if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
49375 goto err;
49376
49377 filp->f_op = &write_pipefifo_fops;
49378 pipe->w_counter++;
49379- if (!pipe->writers++)
49380+ if (atomic_inc_return(&pipe->writers) == 1)
49381 wake_up_partner(inode);
49382
49383- if (!pipe->readers) {
49384+ if (!atomic_read(&pipe->readers)) {
49385 wait_for_partner(inode, &pipe->r_counter);
49386 if (signal_pending(current))
49387 goto err_wr;
49388@@ -107,11 +107,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
49389 */
49390 filp->f_op = &rdwr_pipefifo_fops;
49391
49392- pipe->readers++;
49393- pipe->writers++;
49394+ atomic_inc(&pipe->readers);
49395+ atomic_inc(&pipe->writers);
49396 pipe->r_counter++;
49397 pipe->w_counter++;
49398- if (pipe->readers == 1 || pipe->writers == 1)
49399+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
49400 wake_up_partner(inode);
49401 break;
49402
49403@@ -125,19 +125,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
49404 return 0;
49405
49406 err_rd:
49407- if (!--pipe->readers)
49408+ if (atomic_dec_and_test(&pipe->readers))
49409 wake_up_interruptible(&pipe->wait);
49410 ret = -ERESTARTSYS;
49411 goto err;
49412
49413 err_wr:
49414- if (!--pipe->writers)
49415+ if (atomic_dec_and_test(&pipe->writers))
49416 wake_up_interruptible(&pipe->wait);
49417 ret = -ERESTARTSYS;
49418 goto err;
49419
49420 err:
49421- if (!pipe->readers && !pipe->writers)
49422+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
49423 free_pipe_info(inode);
49424
49425 err_nocleanup:
49426diff --git a/fs/file.c b/fs/file.c
49427index 87e1290..a930cc4 100644
49428--- a/fs/file.c
49429+++ b/fs/file.c
49430@@ -14,6 +14,7 @@
49431 #include <linux/slab.h>
49432 #include <linux/vmalloc.h>
49433 #include <linux/file.h>
49434+#include <linux/security.h>
49435 #include <linux/fdtable.h>
49436 #include <linux/bitops.h>
49437 #include <linux/interrupt.h>
49438@@ -257,6 +258,8 @@ int expand_files(struct files_struct *files, int nr)
49439 * N.B. For clone tasks sharing a files structure, this test
49440 * will limit the total number of files that can be opened.
49441 */
49442+
49443+ gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
49444 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
49445 return -EMFILE;
49446
49447diff --git a/fs/filesystems.c b/fs/filesystems.c
49448index a24c58e..53f91ee 100644
49449--- a/fs/filesystems.c
49450+++ b/fs/filesystems.c
49451@@ -272,7 +272,12 @@ struct file_system_type *get_fs_type(const char *name)
49452 int len = dot ? dot - name : strlen(name);
49453
49454 fs = __get_fs_type(name, len);
49455+
49456+#ifdef CONFIG_GRKERNSEC_MODHARDEN
49457+ if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
49458+#else
49459 if (!fs && (request_module("%.*s", len, name) == 0))
49460+#endif
49461 fs = __get_fs_type(name, len);
49462
49463 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
49464diff --git a/fs/fs_struct.c b/fs/fs_struct.c
49465index eee0590..ef5bc0e 100644
49466--- a/fs/fs_struct.c
49467+++ b/fs/fs_struct.c
49468@@ -4,6 +4,7 @@
49469 #include <linux/path.h>
49470 #include <linux/slab.h>
49471 #include <linux/fs_struct.h>
49472+#include <linux/grsecurity.h>
49473
49474 /*
49475 * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
49476@@ -17,6 +18,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
49477 old_root = fs->root;
49478 fs->root = *path;
49479 path_get(path);
49480+ gr_set_chroot_entries(current, path);
49481 write_unlock(&fs->lock);
49482 if (old_root.dentry)
49483 path_put(&old_root);
49484@@ -56,6 +58,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
49485 && fs->root.mnt == old_root->mnt) {
49486 path_get(new_root);
49487 fs->root = *new_root;
49488+ gr_set_chroot_entries(p, new_root);
49489 count++;
49490 }
49491 if (fs->pwd.dentry == old_root->dentry
49492@@ -89,7 +92,8 @@ void exit_fs(struct task_struct *tsk)
49493 task_lock(tsk);
49494 write_lock(&fs->lock);
49495 tsk->fs = NULL;
49496- kill = !--fs->users;
49497+ gr_clear_chroot_entries(tsk);
49498+ kill = !atomic_dec_return(&fs->users);
49499 write_unlock(&fs->lock);
49500 task_unlock(tsk);
49501 if (kill)
49502@@ -102,7 +106,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
49503 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
49504 /* We don't need to lock fs - think why ;-) */
49505 if (fs) {
49506- fs->users = 1;
49507+ atomic_set(&fs->users, 1);
49508 fs->in_exec = 0;
49509 rwlock_init(&fs->lock);
49510 fs->umask = old->umask;
49511@@ -127,8 +131,9 @@ int unshare_fs_struct(void)
49512
49513 task_lock(current);
49514 write_lock(&fs->lock);
49515- kill = !--fs->users;
49516+ kill = !atomic_dec_return(&fs->users);
49517 current->fs = new_fs;
49518+ gr_set_chroot_entries(current, &new_fs->root);
49519 write_unlock(&fs->lock);
49520 task_unlock(current);
49521
49522@@ -147,7 +152,7 @@ EXPORT_SYMBOL(current_umask);
49523
49524 /* to be mentioned only in INIT_TASK */
49525 struct fs_struct init_fs = {
49526- .users = 1,
49527+ .users = ATOMIC_INIT(1),
49528 .lock = __RW_LOCK_UNLOCKED(init_fs.lock),
49529 .umask = 0022,
49530 };
49531@@ -162,12 +167,13 @@ void daemonize_fs_struct(void)
49532 task_lock(current);
49533
49534 write_lock(&init_fs.lock);
49535- init_fs.users++;
49536+ atomic_inc(&init_fs.users);
49537 write_unlock(&init_fs.lock);
49538
49539 write_lock(&fs->lock);
49540 current->fs = &init_fs;
49541- kill = !--fs->users;
49542+ gr_set_chroot_entries(current, &current->fs->root);
49543+ kill = !atomic_dec_return(&fs->users);
49544 write_unlock(&fs->lock);
49545
49546 task_unlock(current);
49547diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
49548index 9905350..02eaec4 100644
49549--- a/fs/fscache/cookie.c
49550+++ b/fs/fscache/cookie.c
49551@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
49552 parent ? (char *) parent->def->name : "<no-parent>",
49553 def->name, netfs_data);
49554
49555- fscache_stat(&fscache_n_acquires);
49556+ fscache_stat_unchecked(&fscache_n_acquires);
49557
49558 /* if there's no parent cookie, then we don't create one here either */
49559 if (!parent) {
49560- fscache_stat(&fscache_n_acquires_null);
49561+ fscache_stat_unchecked(&fscache_n_acquires_null);
49562 _leave(" [no parent]");
49563 return NULL;
49564 }
49565@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
49566 /* allocate and initialise a cookie */
49567 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
49568 if (!cookie) {
49569- fscache_stat(&fscache_n_acquires_oom);
49570+ fscache_stat_unchecked(&fscache_n_acquires_oom);
49571 _leave(" [ENOMEM]");
49572 return NULL;
49573 }
49574@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
49575
49576 switch (cookie->def->type) {
49577 case FSCACHE_COOKIE_TYPE_INDEX:
49578- fscache_stat(&fscache_n_cookie_index);
49579+ fscache_stat_unchecked(&fscache_n_cookie_index);
49580 break;
49581 case FSCACHE_COOKIE_TYPE_DATAFILE:
49582- fscache_stat(&fscache_n_cookie_data);
49583+ fscache_stat_unchecked(&fscache_n_cookie_data);
49584 break;
49585 default:
49586- fscache_stat(&fscache_n_cookie_special);
49587+ fscache_stat_unchecked(&fscache_n_cookie_special);
49588 break;
49589 }
49590
49591@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
49592 if (fscache_acquire_non_index_cookie(cookie) < 0) {
49593 atomic_dec(&parent->n_children);
49594 __fscache_cookie_put(cookie);
49595- fscache_stat(&fscache_n_acquires_nobufs);
49596+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
49597 _leave(" = NULL");
49598 return NULL;
49599 }
49600 }
49601
49602- fscache_stat(&fscache_n_acquires_ok);
49603+ fscache_stat_unchecked(&fscache_n_acquires_ok);
49604 _leave(" = %p", cookie);
49605 return cookie;
49606 }
49607@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
49608 cache = fscache_select_cache_for_object(cookie->parent);
49609 if (!cache) {
49610 up_read(&fscache_addremove_sem);
49611- fscache_stat(&fscache_n_acquires_no_cache);
49612+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
49613 _leave(" = -ENOMEDIUM [no cache]");
49614 return -ENOMEDIUM;
49615 }
49616@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
49617 object = cache->ops->alloc_object(cache, cookie);
49618 fscache_stat_d(&fscache_n_cop_alloc_object);
49619 if (IS_ERR(object)) {
49620- fscache_stat(&fscache_n_object_no_alloc);
49621+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
49622 ret = PTR_ERR(object);
49623 goto error;
49624 }
49625
49626- fscache_stat(&fscache_n_object_alloc);
49627+ fscache_stat_unchecked(&fscache_n_object_alloc);
49628
49629 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
49630
49631@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
49632 struct fscache_object *object;
49633 struct hlist_node *_p;
49634
49635- fscache_stat(&fscache_n_updates);
49636+ fscache_stat_unchecked(&fscache_n_updates);
49637
49638 if (!cookie) {
49639- fscache_stat(&fscache_n_updates_null);
49640+ fscache_stat_unchecked(&fscache_n_updates_null);
49641 _leave(" [no cookie]");
49642 return;
49643 }
49644@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
49645 struct fscache_object *object;
49646 unsigned long event;
49647
49648- fscache_stat(&fscache_n_relinquishes);
49649+ fscache_stat_unchecked(&fscache_n_relinquishes);
49650 if (retire)
49651- fscache_stat(&fscache_n_relinquishes_retire);
49652+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
49653
49654 if (!cookie) {
49655- fscache_stat(&fscache_n_relinquishes_null);
49656+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
49657 _leave(" [no cookie]");
49658 return;
49659 }
49660@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
49661
49662 /* wait for the cookie to finish being instantiated (or to fail) */
49663 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
49664- fscache_stat(&fscache_n_relinquishes_waitcrt);
49665+ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
49666 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
49667 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
49668 }
49669diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
49670index edd7434..0725e66 100644
49671--- a/fs/fscache/internal.h
49672+++ b/fs/fscache/internal.h
49673@@ -136,94 +136,94 @@ extern void fscache_proc_cleanup(void);
49674 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
49675 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
49676
49677-extern atomic_t fscache_n_op_pend;
49678-extern atomic_t fscache_n_op_run;
49679-extern atomic_t fscache_n_op_enqueue;
49680-extern atomic_t fscache_n_op_deferred_release;
49681-extern atomic_t fscache_n_op_release;
49682-extern atomic_t fscache_n_op_gc;
49683-extern atomic_t fscache_n_op_cancelled;
49684-extern atomic_t fscache_n_op_rejected;
49685+extern atomic_unchecked_t fscache_n_op_pend;
49686+extern atomic_unchecked_t fscache_n_op_run;
49687+extern atomic_unchecked_t fscache_n_op_enqueue;
49688+extern atomic_unchecked_t fscache_n_op_deferred_release;
49689+extern atomic_unchecked_t fscache_n_op_release;
49690+extern atomic_unchecked_t fscache_n_op_gc;
49691+extern atomic_unchecked_t fscache_n_op_cancelled;
49692+extern atomic_unchecked_t fscache_n_op_rejected;
49693
49694-extern atomic_t fscache_n_attr_changed;
49695-extern atomic_t fscache_n_attr_changed_ok;
49696-extern atomic_t fscache_n_attr_changed_nobufs;
49697-extern atomic_t fscache_n_attr_changed_nomem;
49698-extern atomic_t fscache_n_attr_changed_calls;
49699+extern atomic_unchecked_t fscache_n_attr_changed;
49700+extern atomic_unchecked_t fscache_n_attr_changed_ok;
49701+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
49702+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
49703+extern atomic_unchecked_t fscache_n_attr_changed_calls;
49704
49705-extern atomic_t fscache_n_allocs;
49706-extern atomic_t fscache_n_allocs_ok;
49707-extern atomic_t fscache_n_allocs_wait;
49708-extern atomic_t fscache_n_allocs_nobufs;
49709-extern atomic_t fscache_n_allocs_intr;
49710-extern atomic_t fscache_n_allocs_object_dead;
49711-extern atomic_t fscache_n_alloc_ops;
49712-extern atomic_t fscache_n_alloc_op_waits;
49713+extern atomic_unchecked_t fscache_n_allocs;
49714+extern atomic_unchecked_t fscache_n_allocs_ok;
49715+extern atomic_unchecked_t fscache_n_allocs_wait;
49716+extern atomic_unchecked_t fscache_n_allocs_nobufs;
49717+extern atomic_unchecked_t fscache_n_allocs_intr;
49718+extern atomic_unchecked_t fscache_n_allocs_object_dead;
49719+extern atomic_unchecked_t fscache_n_alloc_ops;
49720+extern atomic_unchecked_t fscache_n_alloc_op_waits;
49721
49722-extern atomic_t fscache_n_retrievals;
49723-extern atomic_t fscache_n_retrievals_ok;
49724-extern atomic_t fscache_n_retrievals_wait;
49725-extern atomic_t fscache_n_retrievals_nodata;
49726-extern atomic_t fscache_n_retrievals_nobufs;
49727-extern atomic_t fscache_n_retrievals_intr;
49728-extern atomic_t fscache_n_retrievals_nomem;
49729-extern atomic_t fscache_n_retrievals_object_dead;
49730-extern atomic_t fscache_n_retrieval_ops;
49731-extern atomic_t fscache_n_retrieval_op_waits;
49732+extern atomic_unchecked_t fscache_n_retrievals;
49733+extern atomic_unchecked_t fscache_n_retrievals_ok;
49734+extern atomic_unchecked_t fscache_n_retrievals_wait;
49735+extern atomic_unchecked_t fscache_n_retrievals_nodata;
49736+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
49737+extern atomic_unchecked_t fscache_n_retrievals_intr;
49738+extern atomic_unchecked_t fscache_n_retrievals_nomem;
49739+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
49740+extern atomic_unchecked_t fscache_n_retrieval_ops;
49741+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
49742
49743-extern atomic_t fscache_n_stores;
49744-extern atomic_t fscache_n_stores_ok;
49745-extern atomic_t fscache_n_stores_again;
49746-extern atomic_t fscache_n_stores_nobufs;
49747-extern atomic_t fscache_n_stores_oom;
49748-extern atomic_t fscache_n_store_ops;
49749-extern atomic_t fscache_n_store_calls;
49750-extern atomic_t fscache_n_store_pages;
49751-extern atomic_t fscache_n_store_radix_deletes;
49752-extern atomic_t fscache_n_store_pages_over_limit;
49753+extern atomic_unchecked_t fscache_n_stores;
49754+extern atomic_unchecked_t fscache_n_stores_ok;
49755+extern atomic_unchecked_t fscache_n_stores_again;
49756+extern atomic_unchecked_t fscache_n_stores_nobufs;
49757+extern atomic_unchecked_t fscache_n_stores_oom;
49758+extern atomic_unchecked_t fscache_n_store_ops;
49759+extern atomic_unchecked_t fscache_n_store_calls;
49760+extern atomic_unchecked_t fscache_n_store_pages;
49761+extern atomic_unchecked_t fscache_n_store_radix_deletes;
49762+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
49763
49764-extern atomic_t fscache_n_store_vmscan_not_storing;
49765-extern atomic_t fscache_n_store_vmscan_gone;
49766-extern atomic_t fscache_n_store_vmscan_busy;
49767-extern atomic_t fscache_n_store_vmscan_cancelled;
49768+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
49769+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
49770+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
49771+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
49772
49773-extern atomic_t fscache_n_marks;
49774-extern atomic_t fscache_n_uncaches;
49775+extern atomic_unchecked_t fscache_n_marks;
49776+extern atomic_unchecked_t fscache_n_uncaches;
49777
49778-extern atomic_t fscache_n_acquires;
49779-extern atomic_t fscache_n_acquires_null;
49780-extern atomic_t fscache_n_acquires_no_cache;
49781-extern atomic_t fscache_n_acquires_ok;
49782-extern atomic_t fscache_n_acquires_nobufs;
49783-extern atomic_t fscache_n_acquires_oom;
49784+extern atomic_unchecked_t fscache_n_acquires;
49785+extern atomic_unchecked_t fscache_n_acquires_null;
49786+extern atomic_unchecked_t fscache_n_acquires_no_cache;
49787+extern atomic_unchecked_t fscache_n_acquires_ok;
49788+extern atomic_unchecked_t fscache_n_acquires_nobufs;
49789+extern atomic_unchecked_t fscache_n_acquires_oom;
49790
49791-extern atomic_t fscache_n_updates;
49792-extern atomic_t fscache_n_updates_null;
49793-extern atomic_t fscache_n_updates_run;
49794+extern atomic_unchecked_t fscache_n_updates;
49795+extern atomic_unchecked_t fscache_n_updates_null;
49796+extern atomic_unchecked_t fscache_n_updates_run;
49797
49798-extern atomic_t fscache_n_relinquishes;
49799-extern atomic_t fscache_n_relinquishes_null;
49800-extern atomic_t fscache_n_relinquishes_waitcrt;
49801-extern atomic_t fscache_n_relinquishes_retire;
49802+extern atomic_unchecked_t fscache_n_relinquishes;
49803+extern atomic_unchecked_t fscache_n_relinquishes_null;
49804+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
49805+extern atomic_unchecked_t fscache_n_relinquishes_retire;
49806
49807-extern atomic_t fscache_n_cookie_index;
49808-extern atomic_t fscache_n_cookie_data;
49809-extern atomic_t fscache_n_cookie_special;
49810+extern atomic_unchecked_t fscache_n_cookie_index;
49811+extern atomic_unchecked_t fscache_n_cookie_data;
49812+extern atomic_unchecked_t fscache_n_cookie_special;
49813
49814-extern atomic_t fscache_n_object_alloc;
49815-extern atomic_t fscache_n_object_no_alloc;
49816-extern atomic_t fscache_n_object_lookups;
49817-extern atomic_t fscache_n_object_lookups_negative;
49818-extern atomic_t fscache_n_object_lookups_positive;
49819-extern atomic_t fscache_n_object_lookups_timed_out;
49820-extern atomic_t fscache_n_object_created;
49821-extern atomic_t fscache_n_object_avail;
49822-extern atomic_t fscache_n_object_dead;
49823+extern atomic_unchecked_t fscache_n_object_alloc;
49824+extern atomic_unchecked_t fscache_n_object_no_alloc;
49825+extern atomic_unchecked_t fscache_n_object_lookups;
49826+extern atomic_unchecked_t fscache_n_object_lookups_negative;
49827+extern atomic_unchecked_t fscache_n_object_lookups_positive;
49828+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
49829+extern atomic_unchecked_t fscache_n_object_created;
49830+extern atomic_unchecked_t fscache_n_object_avail;
49831+extern atomic_unchecked_t fscache_n_object_dead;
49832
49833-extern atomic_t fscache_n_checkaux_none;
49834-extern atomic_t fscache_n_checkaux_okay;
49835-extern atomic_t fscache_n_checkaux_update;
49836-extern atomic_t fscache_n_checkaux_obsolete;
49837+extern atomic_unchecked_t fscache_n_checkaux_none;
49838+extern atomic_unchecked_t fscache_n_checkaux_okay;
49839+extern atomic_unchecked_t fscache_n_checkaux_update;
49840+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
49841
49842 extern atomic_t fscache_n_cop_alloc_object;
49843 extern atomic_t fscache_n_cop_lookup_object;
49844@@ -247,6 +247,11 @@ static inline void fscache_stat(atomic_t *stat)
49845 atomic_inc(stat);
49846 }
49847
49848+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
49849+{
49850+ atomic_inc_unchecked(stat);
49851+}
49852+
49853 static inline void fscache_stat_d(atomic_t *stat)
49854 {
49855 atomic_dec(stat);
49856@@ -259,6 +264,7 @@ extern const struct file_operations fscache_stats_fops;
49857
49858 #define __fscache_stat(stat) (NULL)
49859 #define fscache_stat(stat) do {} while (0)
49860+#define fscache_stat_unchecked(stat) do {} while (0)
49861 #define fscache_stat_d(stat) do {} while (0)
49862 #endif
49863
49864diff --git a/fs/fscache/object.c b/fs/fscache/object.c
49865index e513ac5..e888d34 100644
49866--- a/fs/fscache/object.c
49867+++ b/fs/fscache/object.c
49868@@ -144,7 +144,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
49869 /* update the object metadata on disk */
49870 case FSCACHE_OBJECT_UPDATING:
49871 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
49872- fscache_stat(&fscache_n_updates_run);
49873+ fscache_stat_unchecked(&fscache_n_updates_run);
49874 fscache_stat(&fscache_n_cop_update_object);
49875 object->cache->ops->update_object(object);
49876 fscache_stat_d(&fscache_n_cop_update_object);
49877@@ -233,7 +233,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
49878 spin_lock(&object->lock);
49879 object->state = FSCACHE_OBJECT_DEAD;
49880 spin_unlock(&object->lock);
49881- fscache_stat(&fscache_n_object_dead);
49882+ fscache_stat_unchecked(&fscache_n_object_dead);
49883 goto terminal_transit;
49884
49885 /* handle the parent cache of this object being withdrawn from
49886@@ -248,7 +248,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
49887 spin_lock(&object->lock);
49888 object->state = FSCACHE_OBJECT_DEAD;
49889 spin_unlock(&object->lock);
49890- fscache_stat(&fscache_n_object_dead);
49891+ fscache_stat_unchecked(&fscache_n_object_dead);
49892 goto terminal_transit;
49893
49894 /* complain about the object being woken up once it is
49895@@ -492,7 +492,7 @@ static void fscache_lookup_object(struct fscache_object *object)
49896 parent->cookie->def->name, cookie->def->name,
49897 object->cache->tag->name);
49898
49899- fscache_stat(&fscache_n_object_lookups);
49900+ fscache_stat_unchecked(&fscache_n_object_lookups);
49901 fscache_stat(&fscache_n_cop_lookup_object);
49902 ret = object->cache->ops->lookup_object(object);
49903 fscache_stat_d(&fscache_n_cop_lookup_object);
49904@@ -503,7 +503,7 @@ static void fscache_lookup_object(struct fscache_object *object)
49905 if (ret == -ETIMEDOUT) {
49906 /* probably stuck behind another object, so move this one to
49907 * the back of the queue */
49908- fscache_stat(&fscache_n_object_lookups_timed_out);
49909+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
49910 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
49911 }
49912
49913@@ -526,7 +526,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
49914
49915 spin_lock(&object->lock);
49916 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
49917- fscache_stat(&fscache_n_object_lookups_negative);
49918+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
49919
49920 /* transit here to allow write requests to begin stacking up
49921 * and read requests to begin returning ENODATA */
49922@@ -572,7 +572,7 @@ void fscache_obtained_object(struct fscache_object *object)
49923 * result, in which case there may be data available */
49924 spin_lock(&object->lock);
49925 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
49926- fscache_stat(&fscache_n_object_lookups_positive);
49927+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
49928
49929 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
49930
49931@@ -586,7 +586,7 @@ void fscache_obtained_object(struct fscache_object *object)
49932 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
49933 } else {
49934 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
49935- fscache_stat(&fscache_n_object_created);
49936+ fscache_stat_unchecked(&fscache_n_object_created);
49937
49938 object->state = FSCACHE_OBJECT_AVAILABLE;
49939 spin_unlock(&object->lock);
49940@@ -633,7 +633,7 @@ static void fscache_object_available(struct fscache_object *object)
49941 fscache_enqueue_dependents(object);
49942
49943 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
49944- fscache_stat(&fscache_n_object_avail);
49945+ fscache_stat_unchecked(&fscache_n_object_avail);
49946
49947 _leave("");
49948 }
49949@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
49950 enum fscache_checkaux result;
49951
49952 if (!object->cookie->def->check_aux) {
49953- fscache_stat(&fscache_n_checkaux_none);
49954+ fscache_stat_unchecked(&fscache_n_checkaux_none);
49955 return FSCACHE_CHECKAUX_OKAY;
49956 }
49957
49958@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
49959 switch (result) {
49960 /* entry okay as is */
49961 case FSCACHE_CHECKAUX_OKAY:
49962- fscache_stat(&fscache_n_checkaux_okay);
49963+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
49964 break;
49965
49966 /* entry requires update */
49967 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
49968- fscache_stat(&fscache_n_checkaux_update);
49969+ fscache_stat_unchecked(&fscache_n_checkaux_update);
49970 break;
49971
49972 /* entry requires deletion */
49973 case FSCACHE_CHECKAUX_OBSOLETE:
49974- fscache_stat(&fscache_n_checkaux_obsolete);
49975+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
49976 break;
49977
49978 default:
49979diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
49980index 313e79a..775240f 100644
49981--- a/fs/fscache/operation.c
49982+++ b/fs/fscache/operation.c
49983@@ -16,7 +16,7 @@
49984 #include <linux/seq_file.h>
49985 #include "internal.h"
49986
49987-atomic_t fscache_op_debug_id;
49988+atomic_unchecked_t fscache_op_debug_id;
49989 EXPORT_SYMBOL(fscache_op_debug_id);
49990
49991 /**
49992@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
49993 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
49994 ASSERTCMP(atomic_read(&op->usage), >, 0);
49995
49996- fscache_stat(&fscache_n_op_enqueue);
49997+ fscache_stat_unchecked(&fscache_n_op_enqueue);
49998 switch (op->flags & FSCACHE_OP_TYPE) {
49999 case FSCACHE_OP_FAST:
50000 _debug("queue fast");
50001@@ -76,7 +76,7 @@ static void fscache_run_op(struct fscache_object *object,
50002 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
50003 if (op->processor)
50004 fscache_enqueue_operation(op);
50005- fscache_stat(&fscache_n_op_run);
50006+ fscache_stat_unchecked(&fscache_n_op_run);
50007 }
50008
50009 /*
50010@@ -107,11 +107,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
50011 if (object->n_ops > 0) {
50012 atomic_inc(&op->usage);
50013 list_add_tail(&op->pend_link, &object->pending_ops);
50014- fscache_stat(&fscache_n_op_pend);
50015+ fscache_stat_unchecked(&fscache_n_op_pend);
50016 } else if (!list_empty(&object->pending_ops)) {
50017 atomic_inc(&op->usage);
50018 list_add_tail(&op->pend_link, &object->pending_ops);
50019- fscache_stat(&fscache_n_op_pend);
50020+ fscache_stat_unchecked(&fscache_n_op_pend);
50021 fscache_start_operations(object);
50022 } else {
50023 ASSERTCMP(object->n_in_progress, ==, 0);
50024@@ -127,7 +127,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
50025 object->n_exclusive++; /* reads and writes must wait */
50026 atomic_inc(&op->usage);
50027 list_add_tail(&op->pend_link, &object->pending_ops);
50028- fscache_stat(&fscache_n_op_pend);
50029+ fscache_stat_unchecked(&fscache_n_op_pend);
50030 ret = 0;
50031 } else {
50032 /* not allowed to submit ops in any other state */
50033@@ -214,11 +214,11 @@ int fscache_submit_op(struct fscache_object *object,
50034 if (object->n_exclusive > 0) {
50035 atomic_inc(&op->usage);
50036 list_add_tail(&op->pend_link, &object->pending_ops);
50037- fscache_stat(&fscache_n_op_pend);
50038+ fscache_stat_unchecked(&fscache_n_op_pend);
50039 } else if (!list_empty(&object->pending_ops)) {
50040 atomic_inc(&op->usage);
50041 list_add_tail(&op->pend_link, &object->pending_ops);
50042- fscache_stat(&fscache_n_op_pend);
50043+ fscache_stat_unchecked(&fscache_n_op_pend);
50044 fscache_start_operations(object);
50045 } else {
50046 ASSERTCMP(object->n_exclusive, ==, 0);
50047@@ -230,12 +230,12 @@ int fscache_submit_op(struct fscache_object *object,
50048 object->n_ops++;
50049 atomic_inc(&op->usage);
50050 list_add_tail(&op->pend_link, &object->pending_ops);
50051- fscache_stat(&fscache_n_op_pend);
50052+ fscache_stat_unchecked(&fscache_n_op_pend);
50053 ret = 0;
50054 } else if (object->state == FSCACHE_OBJECT_DYING ||
50055 object->state == FSCACHE_OBJECT_LC_DYING ||
50056 object->state == FSCACHE_OBJECT_WITHDRAWING) {
50057- fscache_stat(&fscache_n_op_rejected);
50058+ fscache_stat_unchecked(&fscache_n_op_rejected);
50059 ret = -ENOBUFS;
50060 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
50061 fscache_report_unexpected_submission(object, op, ostate);
50062@@ -305,7 +305,7 @@ int fscache_cancel_op(struct fscache_operation *op)
50063
50064 ret = -EBUSY;
50065 if (!list_empty(&op->pend_link)) {
50066- fscache_stat(&fscache_n_op_cancelled);
50067+ fscache_stat_unchecked(&fscache_n_op_cancelled);
50068 list_del_init(&op->pend_link);
50069 object->n_ops--;
50070 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
50071@@ -344,7 +344,7 @@ void fscache_put_operation(struct fscache_operation *op)
50072 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
50073 BUG();
50074
50075- fscache_stat(&fscache_n_op_release);
50076+ fscache_stat_unchecked(&fscache_n_op_release);
50077
50078 if (op->release) {
50079 op->release(op);
50080@@ -361,7 +361,7 @@ void fscache_put_operation(struct fscache_operation *op)
50081 * lock, and defer it otherwise */
50082 if (!spin_trylock(&object->lock)) {
50083 _debug("defer put");
50084- fscache_stat(&fscache_n_op_deferred_release);
50085+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
50086
50087 cache = object->cache;
50088 spin_lock(&cache->op_gc_list_lock);
50089@@ -423,7 +423,7 @@ void fscache_operation_gc(struct work_struct *work)
50090
50091 _debug("GC DEFERRED REL OBJ%x OP%x",
50092 object->debug_id, op->debug_id);
50093- fscache_stat(&fscache_n_op_gc);
50094+ fscache_stat_unchecked(&fscache_n_op_gc);
50095
50096 ASSERTCMP(atomic_read(&op->usage), ==, 0);
50097
50098diff --git a/fs/fscache/page.c b/fs/fscache/page.c
50099index c598ea4..6aac13e 100644
50100--- a/fs/fscache/page.c
50101+++ b/fs/fscache/page.c
50102@@ -59,7 +59,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
50103 val = radix_tree_lookup(&cookie->stores, page->index);
50104 if (!val) {
50105 rcu_read_unlock();
50106- fscache_stat(&fscache_n_store_vmscan_not_storing);
50107+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
50108 __fscache_uncache_page(cookie, page);
50109 return true;
50110 }
50111@@ -89,11 +89,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
50112 spin_unlock(&cookie->stores_lock);
50113
50114 if (xpage) {
50115- fscache_stat(&fscache_n_store_vmscan_cancelled);
50116- fscache_stat(&fscache_n_store_radix_deletes);
50117+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
50118+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
50119 ASSERTCMP(xpage, ==, page);
50120 } else {
50121- fscache_stat(&fscache_n_store_vmscan_gone);
50122+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
50123 }
50124
50125 wake_up_bit(&cookie->flags, 0);
50126@@ -106,7 +106,7 @@ page_busy:
50127 /* we might want to wait here, but that could deadlock the allocator as
50128 * the slow-work threads writing to the cache may all end up sleeping
50129 * on memory allocation */
50130- fscache_stat(&fscache_n_store_vmscan_busy);
50131+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
50132 return false;
50133 }
50134 EXPORT_SYMBOL(__fscache_maybe_release_page);
50135@@ -130,7 +130,7 @@ static void fscache_end_page_write(struct fscache_object *object,
50136 FSCACHE_COOKIE_STORING_TAG);
50137 if (!radix_tree_tag_get(&cookie->stores, page->index,
50138 FSCACHE_COOKIE_PENDING_TAG)) {
50139- fscache_stat(&fscache_n_store_radix_deletes);
50140+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
50141 xpage = radix_tree_delete(&cookie->stores, page->index);
50142 }
50143 spin_unlock(&cookie->stores_lock);
50144@@ -151,7 +151,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
50145
50146 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
50147
50148- fscache_stat(&fscache_n_attr_changed_calls);
50149+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
50150
50151 if (fscache_object_is_active(object)) {
50152 fscache_set_op_state(op, "CallFS");
50153@@ -178,11 +178,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
50154
50155 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
50156
50157- fscache_stat(&fscache_n_attr_changed);
50158+ fscache_stat_unchecked(&fscache_n_attr_changed);
50159
50160 op = kzalloc(sizeof(*op), GFP_KERNEL);
50161 if (!op) {
50162- fscache_stat(&fscache_n_attr_changed_nomem);
50163+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
50164 _leave(" = -ENOMEM");
50165 return -ENOMEM;
50166 }
50167@@ -202,7 +202,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
50168 if (fscache_submit_exclusive_op(object, op) < 0)
50169 goto nobufs;
50170 spin_unlock(&cookie->lock);
50171- fscache_stat(&fscache_n_attr_changed_ok);
50172+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
50173 fscache_put_operation(op);
50174 _leave(" = 0");
50175 return 0;
50176@@ -210,7 +210,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
50177 nobufs:
50178 spin_unlock(&cookie->lock);
50179 kfree(op);
50180- fscache_stat(&fscache_n_attr_changed_nobufs);
50181+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
50182 _leave(" = %d", -ENOBUFS);
50183 return -ENOBUFS;
50184 }
50185@@ -264,7 +264,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
50186 /* allocate a retrieval operation and attempt to submit it */
50187 op = kzalloc(sizeof(*op), GFP_NOIO);
50188 if (!op) {
50189- fscache_stat(&fscache_n_retrievals_nomem);
50190+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
50191 return NULL;
50192 }
50193
50194@@ -294,13 +294,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
50195 return 0;
50196 }
50197
50198- fscache_stat(&fscache_n_retrievals_wait);
50199+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
50200
50201 jif = jiffies;
50202 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
50203 fscache_wait_bit_interruptible,
50204 TASK_INTERRUPTIBLE) != 0) {
50205- fscache_stat(&fscache_n_retrievals_intr);
50206+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
50207 _leave(" = -ERESTARTSYS");
50208 return -ERESTARTSYS;
50209 }
50210@@ -318,8 +318,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
50211 */
50212 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
50213 struct fscache_retrieval *op,
50214- atomic_t *stat_op_waits,
50215- atomic_t *stat_object_dead)
50216+ atomic_unchecked_t *stat_op_waits,
50217+ atomic_unchecked_t *stat_object_dead)
50218 {
50219 int ret;
50220
50221@@ -327,7 +327,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
50222 goto check_if_dead;
50223
50224 _debug(">>> WT");
50225- fscache_stat(stat_op_waits);
50226+ fscache_stat_unchecked(stat_op_waits);
50227 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
50228 fscache_wait_bit_interruptible,
50229 TASK_INTERRUPTIBLE) < 0) {
50230@@ -344,7 +344,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
50231
50232 check_if_dead:
50233 if (unlikely(fscache_object_is_dead(object))) {
50234- fscache_stat(stat_object_dead);
50235+ fscache_stat_unchecked(stat_object_dead);
50236 return -ENOBUFS;
50237 }
50238 return 0;
50239@@ -371,7 +371,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
50240
50241 _enter("%p,%p,,,", cookie, page);
50242
50243- fscache_stat(&fscache_n_retrievals);
50244+ fscache_stat_unchecked(&fscache_n_retrievals);
50245
50246 if (hlist_empty(&cookie->backing_objects))
50247 goto nobufs;
50248@@ -405,7 +405,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
50249 goto nobufs_unlock;
50250 spin_unlock(&cookie->lock);
50251
50252- fscache_stat(&fscache_n_retrieval_ops);
50253+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
50254
50255 /* pin the netfs read context in case we need to do the actual netfs
50256 * read because we've encountered a cache read failure */
50257@@ -435,15 +435,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
50258
50259 error:
50260 if (ret == -ENOMEM)
50261- fscache_stat(&fscache_n_retrievals_nomem);
50262+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
50263 else if (ret == -ERESTARTSYS)
50264- fscache_stat(&fscache_n_retrievals_intr);
50265+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
50266 else if (ret == -ENODATA)
50267- fscache_stat(&fscache_n_retrievals_nodata);
50268+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
50269 else if (ret < 0)
50270- fscache_stat(&fscache_n_retrievals_nobufs);
50271+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
50272 else
50273- fscache_stat(&fscache_n_retrievals_ok);
50274+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
50275
50276 fscache_put_retrieval(op);
50277 _leave(" = %d", ret);
50278@@ -453,7 +453,7 @@ nobufs_unlock:
50279 spin_unlock(&cookie->lock);
50280 kfree(op);
50281 nobufs:
50282- fscache_stat(&fscache_n_retrievals_nobufs);
50283+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
50284 _leave(" = -ENOBUFS");
50285 return -ENOBUFS;
50286 }
50287@@ -491,7 +491,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
50288
50289 _enter("%p,,%d,,,", cookie, *nr_pages);
50290
50291- fscache_stat(&fscache_n_retrievals);
50292+ fscache_stat_unchecked(&fscache_n_retrievals);
50293
50294 if (hlist_empty(&cookie->backing_objects))
50295 goto nobufs;
50296@@ -522,7 +522,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
50297 goto nobufs_unlock;
50298 spin_unlock(&cookie->lock);
50299
50300- fscache_stat(&fscache_n_retrieval_ops);
50301+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
50302
50303 /* pin the netfs read context in case we need to do the actual netfs
50304 * read because we've encountered a cache read failure */
50305@@ -552,15 +552,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
50306
50307 error:
50308 if (ret == -ENOMEM)
50309- fscache_stat(&fscache_n_retrievals_nomem);
50310+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
50311 else if (ret == -ERESTARTSYS)
50312- fscache_stat(&fscache_n_retrievals_intr);
50313+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
50314 else if (ret == -ENODATA)
50315- fscache_stat(&fscache_n_retrievals_nodata);
50316+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
50317 else if (ret < 0)
50318- fscache_stat(&fscache_n_retrievals_nobufs);
50319+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
50320 else
50321- fscache_stat(&fscache_n_retrievals_ok);
50322+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
50323
50324 fscache_put_retrieval(op);
50325 _leave(" = %d", ret);
50326@@ -570,7 +570,7 @@ nobufs_unlock:
50327 spin_unlock(&cookie->lock);
50328 kfree(op);
50329 nobufs:
50330- fscache_stat(&fscache_n_retrievals_nobufs);
50331+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
50332 _leave(" = -ENOBUFS");
50333 return -ENOBUFS;
50334 }
50335@@ -594,7 +594,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
50336
50337 _enter("%p,%p,,,", cookie, page);
50338
50339- fscache_stat(&fscache_n_allocs);
50340+ fscache_stat_unchecked(&fscache_n_allocs);
50341
50342 if (hlist_empty(&cookie->backing_objects))
50343 goto nobufs;
50344@@ -621,7 +621,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
50345 goto nobufs_unlock;
50346 spin_unlock(&cookie->lock);
50347
50348- fscache_stat(&fscache_n_alloc_ops);
50349+ fscache_stat_unchecked(&fscache_n_alloc_ops);
50350
50351 ret = fscache_wait_for_retrieval_activation(
50352 object, op,
50353@@ -637,11 +637,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
50354
50355 error:
50356 if (ret == -ERESTARTSYS)
50357- fscache_stat(&fscache_n_allocs_intr);
50358+ fscache_stat_unchecked(&fscache_n_allocs_intr);
50359 else if (ret < 0)
50360- fscache_stat(&fscache_n_allocs_nobufs);
50361+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
50362 else
50363- fscache_stat(&fscache_n_allocs_ok);
50364+ fscache_stat_unchecked(&fscache_n_allocs_ok);
50365
50366 fscache_put_retrieval(op);
50367 _leave(" = %d", ret);
50368@@ -651,7 +651,7 @@ nobufs_unlock:
50369 spin_unlock(&cookie->lock);
50370 kfree(op);
50371 nobufs:
50372- fscache_stat(&fscache_n_allocs_nobufs);
50373+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
50374 _leave(" = -ENOBUFS");
50375 return -ENOBUFS;
50376 }
50377@@ -694,7 +694,7 @@ static void fscache_write_op(struct fscache_operation *_op)
50378
50379 spin_lock(&cookie->stores_lock);
50380
50381- fscache_stat(&fscache_n_store_calls);
50382+ fscache_stat_unchecked(&fscache_n_store_calls);
50383
50384 /* find a page to store */
50385 page = NULL;
50386@@ -705,7 +705,7 @@ static void fscache_write_op(struct fscache_operation *_op)
50387 page = results[0];
50388 _debug("gang %d [%lx]", n, page->index);
50389 if (page->index > op->store_limit) {
50390- fscache_stat(&fscache_n_store_pages_over_limit);
50391+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
50392 goto superseded;
50393 }
50394
50395@@ -721,7 +721,7 @@ static void fscache_write_op(struct fscache_operation *_op)
50396
50397 if (page) {
50398 fscache_set_op_state(&op->op, "Store");
50399- fscache_stat(&fscache_n_store_pages);
50400+ fscache_stat_unchecked(&fscache_n_store_pages);
50401 fscache_stat(&fscache_n_cop_write_page);
50402 ret = object->cache->ops->write_page(op, page);
50403 fscache_stat_d(&fscache_n_cop_write_page);
50404@@ -792,7 +792,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
50405 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
50406 ASSERT(PageFsCache(page));
50407
50408- fscache_stat(&fscache_n_stores);
50409+ fscache_stat_unchecked(&fscache_n_stores);
50410
50411 op = kzalloc(sizeof(*op), GFP_NOIO);
50412 if (!op)
50413@@ -844,7 +844,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
50414 spin_unlock(&cookie->stores_lock);
50415 spin_unlock(&object->lock);
50416
50417- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
50418+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
50419 op->store_limit = object->store_limit;
50420
50421 if (fscache_submit_op(object, &op->op) < 0)
50422@@ -852,8 +852,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
50423
50424 spin_unlock(&cookie->lock);
50425 radix_tree_preload_end();
50426- fscache_stat(&fscache_n_store_ops);
50427- fscache_stat(&fscache_n_stores_ok);
50428+ fscache_stat_unchecked(&fscache_n_store_ops);
50429+ fscache_stat_unchecked(&fscache_n_stores_ok);
50430
50431 /* the slow work queue now carries its own ref on the object */
50432 fscache_put_operation(&op->op);
50433@@ -861,14 +861,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
50434 return 0;
50435
50436 already_queued:
50437- fscache_stat(&fscache_n_stores_again);
50438+ fscache_stat_unchecked(&fscache_n_stores_again);
50439 already_pending:
50440 spin_unlock(&cookie->stores_lock);
50441 spin_unlock(&object->lock);
50442 spin_unlock(&cookie->lock);
50443 radix_tree_preload_end();
50444 kfree(op);
50445- fscache_stat(&fscache_n_stores_ok);
50446+ fscache_stat_unchecked(&fscache_n_stores_ok);
50447 _leave(" = 0");
50448 return 0;
50449
50450@@ -886,14 +886,14 @@ nobufs:
50451 spin_unlock(&cookie->lock);
50452 radix_tree_preload_end();
50453 kfree(op);
50454- fscache_stat(&fscache_n_stores_nobufs);
50455+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
50456 _leave(" = -ENOBUFS");
50457 return -ENOBUFS;
50458
50459 nomem_free:
50460 kfree(op);
50461 nomem:
50462- fscache_stat(&fscache_n_stores_oom);
50463+ fscache_stat_unchecked(&fscache_n_stores_oom);
50464 _leave(" = -ENOMEM");
50465 return -ENOMEM;
50466 }
50467@@ -911,7 +911,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
50468 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
50469 ASSERTCMP(page, !=, NULL);
50470
50471- fscache_stat(&fscache_n_uncaches);
50472+ fscache_stat_unchecked(&fscache_n_uncaches);
50473
50474 /* cache withdrawal may beat us to it */
50475 if (!PageFsCache(page))
50476@@ -964,7 +964,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
50477 unsigned long loop;
50478
50479 #ifdef CONFIG_FSCACHE_STATS
50480- atomic_add(pagevec->nr, &fscache_n_marks);
50481+ atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
50482 #endif
50483
50484 for (loop = 0; loop < pagevec->nr; loop++) {
50485diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
50486index 46435f3..8cddf18 100644
50487--- a/fs/fscache/stats.c
50488+++ b/fs/fscache/stats.c
50489@@ -18,95 +18,95 @@
50490 /*
50491 * operation counters
50492 */
50493-atomic_t fscache_n_op_pend;
50494-atomic_t fscache_n_op_run;
50495-atomic_t fscache_n_op_enqueue;
50496-atomic_t fscache_n_op_requeue;
50497-atomic_t fscache_n_op_deferred_release;
50498-atomic_t fscache_n_op_release;
50499-atomic_t fscache_n_op_gc;
50500-atomic_t fscache_n_op_cancelled;
50501-atomic_t fscache_n_op_rejected;
50502+atomic_unchecked_t fscache_n_op_pend;
50503+atomic_unchecked_t fscache_n_op_run;
50504+atomic_unchecked_t fscache_n_op_enqueue;
50505+atomic_unchecked_t fscache_n_op_requeue;
50506+atomic_unchecked_t fscache_n_op_deferred_release;
50507+atomic_unchecked_t fscache_n_op_release;
50508+atomic_unchecked_t fscache_n_op_gc;
50509+atomic_unchecked_t fscache_n_op_cancelled;
50510+atomic_unchecked_t fscache_n_op_rejected;
50511
50512-atomic_t fscache_n_attr_changed;
50513-atomic_t fscache_n_attr_changed_ok;
50514-atomic_t fscache_n_attr_changed_nobufs;
50515-atomic_t fscache_n_attr_changed_nomem;
50516-atomic_t fscache_n_attr_changed_calls;
50517+atomic_unchecked_t fscache_n_attr_changed;
50518+atomic_unchecked_t fscache_n_attr_changed_ok;
50519+atomic_unchecked_t fscache_n_attr_changed_nobufs;
50520+atomic_unchecked_t fscache_n_attr_changed_nomem;
50521+atomic_unchecked_t fscache_n_attr_changed_calls;
50522
50523-atomic_t fscache_n_allocs;
50524-atomic_t fscache_n_allocs_ok;
50525-atomic_t fscache_n_allocs_wait;
50526-atomic_t fscache_n_allocs_nobufs;
50527-atomic_t fscache_n_allocs_intr;
50528-atomic_t fscache_n_allocs_object_dead;
50529-atomic_t fscache_n_alloc_ops;
50530-atomic_t fscache_n_alloc_op_waits;
50531+atomic_unchecked_t fscache_n_allocs;
50532+atomic_unchecked_t fscache_n_allocs_ok;
50533+atomic_unchecked_t fscache_n_allocs_wait;
50534+atomic_unchecked_t fscache_n_allocs_nobufs;
50535+atomic_unchecked_t fscache_n_allocs_intr;
50536+atomic_unchecked_t fscache_n_allocs_object_dead;
50537+atomic_unchecked_t fscache_n_alloc_ops;
50538+atomic_unchecked_t fscache_n_alloc_op_waits;
50539
50540-atomic_t fscache_n_retrievals;
50541-atomic_t fscache_n_retrievals_ok;
50542-atomic_t fscache_n_retrievals_wait;
50543-atomic_t fscache_n_retrievals_nodata;
50544-atomic_t fscache_n_retrievals_nobufs;
50545-atomic_t fscache_n_retrievals_intr;
50546-atomic_t fscache_n_retrievals_nomem;
50547-atomic_t fscache_n_retrievals_object_dead;
50548-atomic_t fscache_n_retrieval_ops;
50549-atomic_t fscache_n_retrieval_op_waits;
50550+atomic_unchecked_t fscache_n_retrievals;
50551+atomic_unchecked_t fscache_n_retrievals_ok;
50552+atomic_unchecked_t fscache_n_retrievals_wait;
50553+atomic_unchecked_t fscache_n_retrievals_nodata;
50554+atomic_unchecked_t fscache_n_retrievals_nobufs;
50555+atomic_unchecked_t fscache_n_retrievals_intr;
50556+atomic_unchecked_t fscache_n_retrievals_nomem;
50557+atomic_unchecked_t fscache_n_retrievals_object_dead;
50558+atomic_unchecked_t fscache_n_retrieval_ops;
50559+atomic_unchecked_t fscache_n_retrieval_op_waits;
50560
50561-atomic_t fscache_n_stores;
50562-atomic_t fscache_n_stores_ok;
50563-atomic_t fscache_n_stores_again;
50564-atomic_t fscache_n_stores_nobufs;
50565-atomic_t fscache_n_stores_oom;
50566-atomic_t fscache_n_store_ops;
50567-atomic_t fscache_n_store_calls;
50568-atomic_t fscache_n_store_pages;
50569-atomic_t fscache_n_store_radix_deletes;
50570-atomic_t fscache_n_store_pages_over_limit;
50571+atomic_unchecked_t fscache_n_stores;
50572+atomic_unchecked_t fscache_n_stores_ok;
50573+atomic_unchecked_t fscache_n_stores_again;
50574+atomic_unchecked_t fscache_n_stores_nobufs;
50575+atomic_unchecked_t fscache_n_stores_oom;
50576+atomic_unchecked_t fscache_n_store_ops;
50577+atomic_unchecked_t fscache_n_store_calls;
50578+atomic_unchecked_t fscache_n_store_pages;
50579+atomic_unchecked_t fscache_n_store_radix_deletes;
50580+atomic_unchecked_t fscache_n_store_pages_over_limit;
50581
50582-atomic_t fscache_n_store_vmscan_not_storing;
50583-atomic_t fscache_n_store_vmscan_gone;
50584-atomic_t fscache_n_store_vmscan_busy;
50585-atomic_t fscache_n_store_vmscan_cancelled;
50586+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
50587+atomic_unchecked_t fscache_n_store_vmscan_gone;
50588+atomic_unchecked_t fscache_n_store_vmscan_busy;
50589+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
50590
50591-atomic_t fscache_n_marks;
50592-atomic_t fscache_n_uncaches;
50593+atomic_unchecked_t fscache_n_marks;
50594+atomic_unchecked_t fscache_n_uncaches;
50595
50596-atomic_t fscache_n_acquires;
50597-atomic_t fscache_n_acquires_null;
50598-atomic_t fscache_n_acquires_no_cache;
50599-atomic_t fscache_n_acquires_ok;
50600-atomic_t fscache_n_acquires_nobufs;
50601-atomic_t fscache_n_acquires_oom;
50602+atomic_unchecked_t fscache_n_acquires;
50603+atomic_unchecked_t fscache_n_acquires_null;
50604+atomic_unchecked_t fscache_n_acquires_no_cache;
50605+atomic_unchecked_t fscache_n_acquires_ok;
50606+atomic_unchecked_t fscache_n_acquires_nobufs;
50607+atomic_unchecked_t fscache_n_acquires_oom;
50608
50609-atomic_t fscache_n_updates;
50610-atomic_t fscache_n_updates_null;
50611-atomic_t fscache_n_updates_run;
50612+atomic_unchecked_t fscache_n_updates;
50613+atomic_unchecked_t fscache_n_updates_null;
50614+atomic_unchecked_t fscache_n_updates_run;
50615
50616-atomic_t fscache_n_relinquishes;
50617-atomic_t fscache_n_relinquishes_null;
50618-atomic_t fscache_n_relinquishes_waitcrt;
50619-atomic_t fscache_n_relinquishes_retire;
50620+atomic_unchecked_t fscache_n_relinquishes;
50621+atomic_unchecked_t fscache_n_relinquishes_null;
50622+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
50623+atomic_unchecked_t fscache_n_relinquishes_retire;
50624
50625-atomic_t fscache_n_cookie_index;
50626-atomic_t fscache_n_cookie_data;
50627-atomic_t fscache_n_cookie_special;
50628+atomic_unchecked_t fscache_n_cookie_index;
50629+atomic_unchecked_t fscache_n_cookie_data;
50630+atomic_unchecked_t fscache_n_cookie_special;
50631
50632-atomic_t fscache_n_object_alloc;
50633-atomic_t fscache_n_object_no_alloc;
50634-atomic_t fscache_n_object_lookups;
50635-atomic_t fscache_n_object_lookups_negative;
50636-atomic_t fscache_n_object_lookups_positive;
50637-atomic_t fscache_n_object_lookups_timed_out;
50638-atomic_t fscache_n_object_created;
50639-atomic_t fscache_n_object_avail;
50640-atomic_t fscache_n_object_dead;
50641+atomic_unchecked_t fscache_n_object_alloc;
50642+atomic_unchecked_t fscache_n_object_no_alloc;
50643+atomic_unchecked_t fscache_n_object_lookups;
50644+atomic_unchecked_t fscache_n_object_lookups_negative;
50645+atomic_unchecked_t fscache_n_object_lookups_positive;
50646+atomic_unchecked_t fscache_n_object_lookups_timed_out;
50647+atomic_unchecked_t fscache_n_object_created;
50648+atomic_unchecked_t fscache_n_object_avail;
50649+atomic_unchecked_t fscache_n_object_dead;
50650
50651-atomic_t fscache_n_checkaux_none;
50652-atomic_t fscache_n_checkaux_okay;
50653-atomic_t fscache_n_checkaux_update;
50654-atomic_t fscache_n_checkaux_obsolete;
50655+atomic_unchecked_t fscache_n_checkaux_none;
50656+atomic_unchecked_t fscache_n_checkaux_okay;
50657+atomic_unchecked_t fscache_n_checkaux_update;
50658+atomic_unchecked_t fscache_n_checkaux_obsolete;
50659
50660 atomic_t fscache_n_cop_alloc_object;
50661 atomic_t fscache_n_cop_lookup_object;
50662@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
50663 seq_puts(m, "FS-Cache statistics\n");
50664
50665 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
50666- atomic_read(&fscache_n_cookie_index),
50667- atomic_read(&fscache_n_cookie_data),
50668- atomic_read(&fscache_n_cookie_special));
50669+ atomic_read_unchecked(&fscache_n_cookie_index),
50670+ atomic_read_unchecked(&fscache_n_cookie_data),
50671+ atomic_read_unchecked(&fscache_n_cookie_special));
50672
50673 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
50674- atomic_read(&fscache_n_object_alloc),
50675- atomic_read(&fscache_n_object_no_alloc),
50676- atomic_read(&fscache_n_object_avail),
50677- atomic_read(&fscache_n_object_dead));
50678+ atomic_read_unchecked(&fscache_n_object_alloc),
50679+ atomic_read_unchecked(&fscache_n_object_no_alloc),
50680+ atomic_read_unchecked(&fscache_n_object_avail),
50681+ atomic_read_unchecked(&fscache_n_object_dead));
50682 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
50683- atomic_read(&fscache_n_checkaux_none),
50684- atomic_read(&fscache_n_checkaux_okay),
50685- atomic_read(&fscache_n_checkaux_update),
50686- atomic_read(&fscache_n_checkaux_obsolete));
50687+ atomic_read_unchecked(&fscache_n_checkaux_none),
50688+ atomic_read_unchecked(&fscache_n_checkaux_okay),
50689+ atomic_read_unchecked(&fscache_n_checkaux_update),
50690+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
50691
50692 seq_printf(m, "Pages : mrk=%u unc=%u\n",
50693- atomic_read(&fscache_n_marks),
50694- atomic_read(&fscache_n_uncaches));
50695+ atomic_read_unchecked(&fscache_n_marks),
50696+ atomic_read_unchecked(&fscache_n_uncaches));
50697
50698 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
50699 " oom=%u\n",
50700- atomic_read(&fscache_n_acquires),
50701- atomic_read(&fscache_n_acquires_null),
50702- atomic_read(&fscache_n_acquires_no_cache),
50703- atomic_read(&fscache_n_acquires_ok),
50704- atomic_read(&fscache_n_acquires_nobufs),
50705- atomic_read(&fscache_n_acquires_oom));
50706+ atomic_read_unchecked(&fscache_n_acquires),
50707+ atomic_read_unchecked(&fscache_n_acquires_null),
50708+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
50709+ atomic_read_unchecked(&fscache_n_acquires_ok),
50710+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
50711+ atomic_read_unchecked(&fscache_n_acquires_oom));
50712
50713 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
50714- atomic_read(&fscache_n_object_lookups),
50715- atomic_read(&fscache_n_object_lookups_negative),
50716- atomic_read(&fscache_n_object_lookups_positive),
50717- atomic_read(&fscache_n_object_lookups_timed_out),
50718- atomic_read(&fscache_n_object_created));
50719+ atomic_read_unchecked(&fscache_n_object_lookups),
50720+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
50721+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
50722+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out),
50723+ atomic_read_unchecked(&fscache_n_object_created));
50724
50725 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
50726- atomic_read(&fscache_n_updates),
50727- atomic_read(&fscache_n_updates_null),
50728- atomic_read(&fscache_n_updates_run));
50729+ atomic_read_unchecked(&fscache_n_updates),
50730+ atomic_read_unchecked(&fscache_n_updates_null),
50731+ atomic_read_unchecked(&fscache_n_updates_run));
50732
50733 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
50734- atomic_read(&fscache_n_relinquishes),
50735- atomic_read(&fscache_n_relinquishes_null),
50736- atomic_read(&fscache_n_relinquishes_waitcrt),
50737- atomic_read(&fscache_n_relinquishes_retire));
50738+ atomic_read_unchecked(&fscache_n_relinquishes),
50739+ atomic_read_unchecked(&fscache_n_relinquishes_null),
50740+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
50741+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
50742
50743 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
50744- atomic_read(&fscache_n_attr_changed),
50745- atomic_read(&fscache_n_attr_changed_ok),
50746- atomic_read(&fscache_n_attr_changed_nobufs),
50747- atomic_read(&fscache_n_attr_changed_nomem),
50748- atomic_read(&fscache_n_attr_changed_calls));
50749+ atomic_read_unchecked(&fscache_n_attr_changed),
50750+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
50751+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
50752+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
50753+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
50754
50755 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
50756- atomic_read(&fscache_n_allocs),
50757- atomic_read(&fscache_n_allocs_ok),
50758- atomic_read(&fscache_n_allocs_wait),
50759- atomic_read(&fscache_n_allocs_nobufs),
50760- atomic_read(&fscache_n_allocs_intr));
50761+ atomic_read_unchecked(&fscache_n_allocs),
50762+ atomic_read_unchecked(&fscache_n_allocs_ok),
50763+ atomic_read_unchecked(&fscache_n_allocs_wait),
50764+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
50765+ atomic_read_unchecked(&fscache_n_allocs_intr));
50766 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
50767- atomic_read(&fscache_n_alloc_ops),
50768- atomic_read(&fscache_n_alloc_op_waits),
50769- atomic_read(&fscache_n_allocs_object_dead));
50770+ atomic_read_unchecked(&fscache_n_alloc_ops),
50771+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
50772+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
50773
50774 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
50775 " int=%u oom=%u\n",
50776- atomic_read(&fscache_n_retrievals),
50777- atomic_read(&fscache_n_retrievals_ok),
50778- atomic_read(&fscache_n_retrievals_wait),
50779- atomic_read(&fscache_n_retrievals_nodata),
50780- atomic_read(&fscache_n_retrievals_nobufs),
50781- atomic_read(&fscache_n_retrievals_intr),
50782- atomic_read(&fscache_n_retrievals_nomem));
50783+ atomic_read_unchecked(&fscache_n_retrievals),
50784+ atomic_read_unchecked(&fscache_n_retrievals_ok),
50785+ atomic_read_unchecked(&fscache_n_retrievals_wait),
50786+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
50787+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
50788+ atomic_read_unchecked(&fscache_n_retrievals_intr),
50789+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
50790 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
50791- atomic_read(&fscache_n_retrieval_ops),
50792- atomic_read(&fscache_n_retrieval_op_waits),
50793- atomic_read(&fscache_n_retrievals_object_dead));
50794+ atomic_read_unchecked(&fscache_n_retrieval_ops),
50795+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
50796+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
50797
50798 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
50799- atomic_read(&fscache_n_stores),
50800- atomic_read(&fscache_n_stores_ok),
50801- atomic_read(&fscache_n_stores_again),
50802- atomic_read(&fscache_n_stores_nobufs),
50803- atomic_read(&fscache_n_stores_oom));
50804+ atomic_read_unchecked(&fscache_n_stores),
50805+ atomic_read_unchecked(&fscache_n_stores_ok),
50806+ atomic_read_unchecked(&fscache_n_stores_again),
50807+ atomic_read_unchecked(&fscache_n_stores_nobufs),
50808+ atomic_read_unchecked(&fscache_n_stores_oom));
50809 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
50810- atomic_read(&fscache_n_store_ops),
50811- atomic_read(&fscache_n_store_calls),
50812- atomic_read(&fscache_n_store_pages),
50813- atomic_read(&fscache_n_store_radix_deletes),
50814- atomic_read(&fscache_n_store_pages_over_limit));
50815+ atomic_read_unchecked(&fscache_n_store_ops),
50816+ atomic_read_unchecked(&fscache_n_store_calls),
50817+ atomic_read_unchecked(&fscache_n_store_pages),
50818+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
50819+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
50820
50821 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
50822- atomic_read(&fscache_n_store_vmscan_not_storing),
50823- atomic_read(&fscache_n_store_vmscan_gone),
50824- atomic_read(&fscache_n_store_vmscan_busy),
50825- atomic_read(&fscache_n_store_vmscan_cancelled));
50826+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
50827+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
50828+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
50829+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
50830
50831 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
50832- atomic_read(&fscache_n_op_pend),
50833- atomic_read(&fscache_n_op_run),
50834- atomic_read(&fscache_n_op_enqueue),
50835- atomic_read(&fscache_n_op_cancelled),
50836- atomic_read(&fscache_n_op_rejected));
50837+ atomic_read_unchecked(&fscache_n_op_pend),
50838+ atomic_read_unchecked(&fscache_n_op_run),
50839+ atomic_read_unchecked(&fscache_n_op_enqueue),
50840+ atomic_read_unchecked(&fscache_n_op_cancelled),
50841+ atomic_read_unchecked(&fscache_n_op_rejected));
50842 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
50843- atomic_read(&fscache_n_op_deferred_release),
50844- atomic_read(&fscache_n_op_release),
50845- atomic_read(&fscache_n_op_gc));
50846+ atomic_read_unchecked(&fscache_n_op_deferred_release),
50847+ atomic_read_unchecked(&fscache_n_op_release),
50848+ atomic_read_unchecked(&fscache_n_op_gc));
50849
50850 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
50851 atomic_read(&fscache_n_cop_alloc_object),
50852diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
50853index de792dc..448b532 100644
50854--- a/fs/fuse/cuse.c
50855+++ b/fs/fuse/cuse.c
50856@@ -576,10 +576,12 @@ static int __init cuse_init(void)
50857 INIT_LIST_HEAD(&cuse_conntbl[i]);
50858
50859 /* inherit and extend fuse_dev_operations */
50860- cuse_channel_fops = fuse_dev_operations;
50861- cuse_channel_fops.owner = THIS_MODULE;
50862- cuse_channel_fops.open = cuse_channel_open;
50863- cuse_channel_fops.release = cuse_channel_release;
50864+ pax_open_kernel();
50865+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
50866+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
50867+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
50868+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
50869+ pax_close_kernel();
50870
50871 cuse_class = class_create(THIS_MODULE, "cuse");
50872 if (IS_ERR(cuse_class))
50873diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
50874index 1facb39..7f48557 100644
50875--- a/fs/fuse/dev.c
50876+++ b/fs/fuse/dev.c
50877@@ -885,7 +885,7 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size,
50878 {
50879 struct fuse_notify_inval_entry_out outarg;
50880 int err = -EINVAL;
50881- char buf[FUSE_NAME_MAX+1];
50882+ char *buf = NULL;
50883 struct qstr name;
50884
50885 if (size < sizeof(outarg))
50886@@ -899,6 +899,11 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size,
50887 if (outarg.namelen > FUSE_NAME_MAX)
50888 goto err;
50889
50890+ err = -ENOMEM;
50891+ buf = kmalloc(FUSE_NAME_MAX+1, GFP_KERNEL);
50892+ if (!buf)
50893+ goto err;
50894+
50895 err = -EINVAL;
50896 if (size != sizeof(outarg) + outarg.namelen + 1)
50897 goto err;
50898@@ -914,17 +919,15 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size,
50899
50900 down_read(&fc->killsb);
50901 err = -ENOENT;
50902- if (!fc->sb)
50903- goto err_unlock;
50904-
50905- err = fuse_reverse_inval_entry(fc->sb, outarg.parent, &name);
50906-
50907-err_unlock:
50908+ if (fc->sb)
50909+ err = fuse_reverse_inval_entry(fc->sb, outarg.parent, &name);
50910 up_read(&fc->killsb);
50911+ kfree(buf);
50912 return err;
50913
50914 err:
50915 fuse_copy_finish(cs);
50916+ kfree(buf);
50917 return err;
50918 }
50919
50920diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
50921index 4787ae6..73efff7 100644
50922--- a/fs/fuse/dir.c
50923+++ b/fs/fuse/dir.c
50924@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *dentry)
50925 return link;
50926 }
50927
50928-static void free_link(char *link)
50929+static void free_link(const char *link)
50930 {
50931 if (!IS_ERR(link))
50932 free_page((unsigned long) link);
50933diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
50934index 247436c..e650ccb 100644
50935--- a/fs/gfs2/ops_inode.c
50936+++ b/fs/gfs2/ops_inode.c
50937@@ -752,6 +752,8 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
50938 unsigned int x;
50939 int error;
50940
50941+ pax_track_stack();
50942+
50943 if (ndentry->d_inode) {
50944 nip = GFS2_I(ndentry->d_inode);
50945 if (ip == nip)
50946diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
50947index 4463297..4fed53b 100644
50948--- a/fs/gfs2/sys.c
50949+++ b/fs/gfs2/sys.c
50950@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct kobject *kobj, struct attribute *attr,
50951 return a->store ? a->store(sdp, buf, len) : len;
50952 }
50953
50954-static struct sysfs_ops gfs2_attr_ops = {
50955+static const struct sysfs_ops gfs2_attr_ops = {
50956 .show = gfs2_attr_show,
50957 .store = gfs2_attr_store,
50958 };
50959@@ -584,7 +584,7 @@ static int gfs2_uevent(struct kset *kset, struct kobject *kobj,
50960 return 0;
50961 }
50962
50963-static struct kset_uevent_ops gfs2_uevent_ops = {
50964+static const struct kset_uevent_ops gfs2_uevent_ops = {
50965 .uevent = gfs2_uevent,
50966 };
50967
50968diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
50969index f6874ac..7cd98a8 100644
50970--- a/fs/hfsplus/catalog.c
50971+++ b/fs/hfsplus/catalog.c
50972@@ -157,6 +157,8 @@ int hfsplus_find_cat(struct super_block *sb, u32 cnid,
50973 int err;
50974 u16 type;
50975
50976+ pax_track_stack();
50977+
50978 hfsplus_cat_build_key(sb, fd->search_key, cnid, NULL);
50979 err = hfs_brec_read(fd, &tmp, sizeof(hfsplus_cat_entry));
50980 if (err)
50981@@ -186,6 +188,8 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir, struct qstr *str, struct ino
50982 int entry_size;
50983 int err;
50984
50985+ pax_track_stack();
50986+
50987 dprint(DBG_CAT_MOD, "create_cat: %s,%u(%d)\n", str->name, cnid, inode->i_nlink);
50988 sb = dir->i_sb;
50989 hfs_find_init(HFSPLUS_SB(sb).cat_tree, &fd);
50990@@ -318,6 +322,8 @@ int hfsplus_rename_cat(u32 cnid,
50991 int entry_size, type;
50992 int err = 0;
50993
50994+ pax_track_stack();
50995+
50996 dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n", cnid, src_dir->i_ino, src_name->name,
50997 dst_dir->i_ino, dst_name->name);
50998 sb = src_dir->i_sb;
50999diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
51000index 5f40236..dac3421 100644
51001--- a/fs/hfsplus/dir.c
51002+++ b/fs/hfsplus/dir.c
51003@@ -121,6 +121,8 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
51004 struct hfsplus_readdir_data *rd;
51005 u16 type;
51006
51007+ pax_track_stack();
51008+
51009 if (filp->f_pos >= inode->i_size)
51010 return 0;
51011
51012diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
51013index 1bcf597..905a251 100644
51014--- a/fs/hfsplus/inode.c
51015+++ b/fs/hfsplus/inode.c
51016@@ -399,6 +399,8 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)
51017 int res = 0;
51018 u16 type;
51019
51020+ pax_track_stack();
51021+
51022 type = hfs_bnode_read_u16(fd->bnode, fd->entryoffset);
51023
51024 HFSPLUS_I(inode).dev = 0;
51025@@ -461,6 +463,8 @@ int hfsplus_cat_write_inode(struct inode *inode)
51026 struct hfs_find_data fd;
51027 hfsplus_cat_entry entry;
51028
51029+ pax_track_stack();
51030+
51031 if (HFSPLUS_IS_RSRC(inode))
51032 main_inode = HFSPLUS_I(inode).rsrc_inode;
51033
51034diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c
51035index f457d2c..7ef4ad5 100644
51036--- a/fs/hfsplus/ioctl.c
51037+++ b/fs/hfsplus/ioctl.c
51038@@ -101,6 +101,8 @@ int hfsplus_setxattr(struct dentry *dentry, const char *name,
51039 struct hfsplus_cat_file *file;
51040 int res;
51041
51042+ pax_track_stack();
51043+
51044 if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
51045 return -EOPNOTSUPP;
51046
51047@@ -143,6 +145,8 @@ ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
51048 struct hfsplus_cat_file *file;
51049 ssize_t res = 0;
51050
51051+ pax_track_stack();
51052+
51053 if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
51054 return -EOPNOTSUPP;
51055
51056diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
51057index 43022f3..7298079 100644
51058--- a/fs/hfsplus/super.c
51059+++ b/fs/hfsplus/super.c
51060@@ -312,6 +312,8 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
51061 struct nls_table *nls = NULL;
51062 int err = -EINVAL;
51063
51064+ pax_track_stack();
51065+
51066 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
51067 if (!sbi)
51068 return -ENOMEM;
51069diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
51070index 87a1258..5694d91 100644
51071--- a/fs/hugetlbfs/inode.c
51072+++ b/fs/hugetlbfs/inode.c
51073@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs_fs_type = {
51074 .kill_sb = kill_litter_super,
51075 };
51076
51077-static struct vfsmount *hugetlbfs_vfsmount;
51078+struct vfsmount *hugetlbfs_vfsmount;
51079
51080 static int can_do_hugetlb_shm(void)
51081 {
51082diff --git a/fs/ioctl.c b/fs/ioctl.c
51083index 6c75110..19d2c3c 100644
51084--- a/fs/ioctl.c
51085+++ b/fs/ioctl.c
51086@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiemap_extent_info *fieinfo, u64 logical,
51087 u64 phys, u64 len, u32 flags)
51088 {
51089 struct fiemap_extent extent;
51090- struct fiemap_extent *dest = fieinfo->fi_extents_start;
51091+ struct fiemap_extent __user *dest = fieinfo->fi_extents_start;
51092
51093 /* only count the extents */
51094 if (fieinfo->fi_extents_max == 0) {
51095@@ -207,7 +207,7 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg)
51096
51097 fieinfo.fi_flags = fiemap.fm_flags;
51098 fieinfo.fi_extents_max = fiemap.fm_extent_count;
51099- fieinfo.fi_extents_start = (struct fiemap_extent *)(arg + sizeof(fiemap));
51100+ fieinfo.fi_extents_start = (struct fiemap_extent __user *)(arg + sizeof(fiemap));
51101
51102 if (fiemap.fm_extent_count != 0 &&
51103 !access_ok(VERIFY_WRITE, fieinfo.fi_extents_start,
51104@@ -220,7 +220,7 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg)
51105 error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, len);
51106 fiemap.fm_flags = fieinfo.fi_flags;
51107 fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped;
51108- if (copy_to_user((char *)arg, &fiemap, sizeof(fiemap)))
51109+ if (copy_to_user((__force char __user *)arg, &fiemap, sizeof(fiemap)))
51110 error = -EFAULT;
51111
51112 return error;
51113diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
51114index b0435dd..81ee0be 100644
51115--- a/fs/jbd/checkpoint.c
51116+++ b/fs/jbd/checkpoint.c
51117@@ -348,6 +348,8 @@ int log_do_checkpoint(journal_t *journal)
51118 tid_t this_tid;
51119 int result;
51120
51121+ pax_track_stack();
51122+
51123 jbd_debug(1, "Start checkpoint\n");
51124
51125 /*
51126diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c
51127index 546d153..736896c 100644
51128--- a/fs/jffs2/compr_rtime.c
51129+++ b/fs/jffs2/compr_rtime.c
51130@@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned char *data_in,
51131 int outpos = 0;
51132 int pos=0;
51133
51134+ pax_track_stack();
51135+
51136 memset(positions,0,sizeof(positions));
51137
51138 while (pos < (*sourcelen) && outpos <= (*dstlen)-2) {
51139@@ -79,6 +81,8 @@ static int jffs2_rtime_decompress(unsigned char *data_in,
51140 int outpos = 0;
51141 int pos=0;
51142
51143+ pax_track_stack();
51144+
51145 memset(positions,0,sizeof(positions));
51146
51147 while (outpos<destlen) {
51148diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c
51149index 170d289..3254b98 100644
51150--- a/fs/jffs2/compr_rubin.c
51151+++ b/fs/jffs2/compr_rubin.c
51152@@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsigned char *data_in,
51153 int ret;
51154 uint32_t mysrclen, mydstlen;
51155
51156+ pax_track_stack();
51157+
51158 mysrclen = *sourcelen;
51159 mydstlen = *dstlen - 8;
51160
51161diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
51162index b47679b..00d65d3 100644
51163--- a/fs/jffs2/erase.c
51164+++ b/fs/jffs2/erase.c
51165@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
51166 struct jffs2_unknown_node marker = {
51167 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
51168 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
51169- .totlen = cpu_to_je32(c->cleanmarker_size)
51170+ .totlen = cpu_to_je32(c->cleanmarker_size),
51171+ .hdr_crc = cpu_to_je32(0)
51172 };
51173
51174 jffs2_prealloc_raw_node_refs(c, jeb, 1);
51175diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
51176index 5ef7bac..4fd1e3c 100644
51177--- a/fs/jffs2/wbuf.c
51178+++ b/fs/jffs2/wbuf.c
51179@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
51180 {
51181 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
51182 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
51183- .totlen = constant_cpu_to_je32(8)
51184+ .totlen = constant_cpu_to_je32(8),
51185+ .hdr_crc = constant_cpu_to_je32(0)
51186 };
51187
51188 /*
51189diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c
51190index 082e844..52012a1 100644
51191--- a/fs/jffs2/xattr.c
51192+++ b/fs/jffs2/xattr.c
51193@@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct jffs2_sb_info *c)
51194
51195 BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
51196
51197+ pax_track_stack();
51198+
51199 /* Phase.1 : Merge same xref */
51200 for (i=0; i < XREF_TMPHASH_SIZE; i++)
51201 xref_tmphash[i] = NULL;
51202diff --git a/fs/jfs/super.c b/fs/jfs/super.c
51203index 2234c73..f6e6e6b 100644
51204--- a/fs/jfs/super.c
51205+++ b/fs/jfs/super.c
51206@@ -793,7 +793,7 @@ static int __init init_jfs_fs(void)
51207
51208 jfs_inode_cachep =
51209 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
51210- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
51211+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
51212 init_once);
51213 if (jfs_inode_cachep == NULL)
51214 return -ENOMEM;
51215diff --git a/fs/libfs.c b/fs/libfs.c
51216index ba36e93..3153fce 100644
51217--- a/fs/libfs.c
51218+++ b/fs/libfs.c
51219@@ -157,12 +157,20 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
51220
51221 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
51222 struct dentry *next;
51223+ char d_name[sizeof(next->d_iname)];
51224+ const unsigned char *name;
51225+
51226 next = list_entry(p, struct dentry, d_u.d_child);
51227 if (d_unhashed(next) || !next->d_inode)
51228 continue;
51229
51230 spin_unlock(&dcache_lock);
51231- if (filldir(dirent, next->d_name.name,
51232+ name = next->d_name.name;
51233+ if (name == next->d_iname) {
51234+ memcpy(d_name, name, next->d_name.len);
51235+ name = d_name;
51236+ }
51237+ if (filldir(dirent, name,
51238 next->d_name.len, filp->f_pos,
51239 next->d_inode->i_ino,
51240 dt_type(next->d_inode)) < 0)
51241diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
51242index c325a83..d15b07b 100644
51243--- a/fs/lockd/clntproc.c
51244+++ b/fs/lockd/clntproc.c
51245@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
51246 /*
51247 * Cookie counter for NLM requests
51248 */
51249-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
51250+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
51251
51252 void nlmclnt_next_cookie(struct nlm_cookie *c)
51253 {
51254- u32 cookie = atomic_inc_return(&nlm_cookie);
51255+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
51256
51257 memcpy(c->data, &cookie, 4);
51258 c->len=4;
51259@@ -621,6 +621,8 @@ nlmclnt_reclaim(struct nlm_host *host, struct file_lock *fl)
51260 struct nlm_rqst reqst, *req;
51261 int status;
51262
51263+ pax_track_stack();
51264+
51265 req = &reqst;
51266 memset(req, 0, sizeof(*req));
51267 locks_init_lock(&req->a_args.lock.fl);
51268diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
51269index 1a54ae1..6a16c27 100644
51270--- a/fs/lockd/svc.c
51271+++ b/fs/lockd/svc.c
51272@@ -43,7 +43,7 @@
51273
51274 static struct svc_program nlmsvc_program;
51275
51276-struct nlmsvc_binding * nlmsvc_ops;
51277+const struct nlmsvc_binding * nlmsvc_ops;
51278 EXPORT_SYMBOL_GPL(nlmsvc_ops);
51279
51280 static DEFINE_MUTEX(nlmsvc_mutex);
51281diff --git a/fs/locks.c b/fs/locks.c
51282index a8794f2..4041e55 100644
51283--- a/fs/locks.c
51284+++ b/fs/locks.c
51285@@ -145,10 +145,28 @@ static LIST_HEAD(blocked_list);
51286
51287 static struct kmem_cache *filelock_cache __read_mostly;
51288
51289+static void locks_init_lock_always(struct file_lock *fl)
51290+{
51291+ fl->fl_next = NULL;
51292+ fl->fl_fasync = NULL;
51293+ fl->fl_owner = NULL;
51294+ fl->fl_pid = 0;
51295+ fl->fl_nspid = NULL;
51296+ fl->fl_file = NULL;
51297+ fl->fl_flags = 0;
51298+ fl->fl_type = 0;
51299+ fl->fl_start = fl->fl_end = 0;
51300+}
51301+
51302 /* Allocate an empty lock structure. */
51303 static struct file_lock *locks_alloc_lock(void)
51304 {
51305- return kmem_cache_alloc(filelock_cache, GFP_KERNEL);
51306+ struct file_lock *fl = kmem_cache_alloc(filelock_cache, GFP_KERNEL);
51307+
51308+ if (fl)
51309+ locks_init_lock_always(fl);
51310+
51311+ return fl;
51312 }
51313
51314 void locks_release_private(struct file_lock *fl)
51315@@ -183,17 +201,9 @@ void locks_init_lock(struct file_lock *fl)
51316 INIT_LIST_HEAD(&fl->fl_link);
51317 INIT_LIST_HEAD(&fl->fl_block);
51318 init_waitqueue_head(&fl->fl_wait);
51319- fl->fl_next = NULL;
51320- fl->fl_fasync = NULL;
51321- fl->fl_owner = NULL;
51322- fl->fl_pid = 0;
51323- fl->fl_nspid = NULL;
51324- fl->fl_file = NULL;
51325- fl->fl_flags = 0;
51326- fl->fl_type = 0;
51327- fl->fl_start = fl->fl_end = 0;
51328 fl->fl_ops = NULL;
51329 fl->fl_lmops = NULL;
51330+ locks_init_lock_always(fl);
51331 }
51332
51333 EXPORT_SYMBOL(locks_init_lock);
51334@@ -2007,16 +2017,16 @@ void locks_remove_flock(struct file *filp)
51335 return;
51336
51337 if (filp->f_op && filp->f_op->flock) {
51338- struct file_lock fl = {
51339+ struct file_lock flock = {
51340 .fl_pid = current->tgid,
51341 .fl_file = filp,
51342 .fl_flags = FL_FLOCK,
51343 .fl_type = F_UNLCK,
51344 .fl_end = OFFSET_MAX,
51345 };
51346- filp->f_op->flock(filp, F_SETLKW, &fl);
51347- if (fl.fl_ops && fl.fl_ops->fl_release_private)
51348- fl.fl_ops->fl_release_private(&fl);
51349+ filp->f_op->flock(filp, F_SETLKW, &flock);
51350+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
51351+ flock.fl_ops->fl_release_private(&flock);
51352 }
51353
51354 lock_kernel();
51355diff --git a/fs/mbcache.c b/fs/mbcache.c
51356index ec88ff3..b843a82 100644
51357--- a/fs/mbcache.c
51358+++ b/fs/mbcache.c
51359@@ -266,9 +266,9 @@ mb_cache_create(const char *name, struct mb_cache_op *cache_op,
51360 if (!cache)
51361 goto fail;
51362 cache->c_name = name;
51363- cache->c_op.free = NULL;
51364+ *(void **)&cache->c_op.free = NULL;
51365 if (cache_op)
51366- cache->c_op.free = cache_op->free;
51367+ *(void **)&cache->c_op.free = cache_op->free;
51368 atomic_set(&cache->c_entry_count, 0);
51369 cache->c_bucket_bits = bucket_bits;
51370 #ifdef MB_CACHE_INDEXES_COUNT
51371diff --git a/fs/namei.c b/fs/namei.c
51372index b0afbd4..8d065a1 100644
51373--- a/fs/namei.c
51374+++ b/fs/namei.c
51375@@ -224,6 +224,14 @@ int generic_permission(struct inode *inode, int mask,
51376 return ret;
51377
51378 /*
51379+ * Searching includes executable on directories, else just read.
51380+ */
51381+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
51382+ if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE)))
51383+ if (capable(CAP_DAC_READ_SEARCH))
51384+ return 0;
51385+
51386+ /*
51387 * Read/write DACs are always overridable.
51388 * Executable DACs are overridable if at least one exec bit is set.
51389 */
51390@@ -231,14 +239,6 @@ int generic_permission(struct inode *inode, int mask,
51391 if (capable(CAP_DAC_OVERRIDE))
51392 return 0;
51393
51394- /*
51395- * Searching includes executable on directories, else just read.
51396- */
51397- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
51398- if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE)))
51399- if (capable(CAP_DAC_READ_SEARCH))
51400- return 0;
51401-
51402 return -EACCES;
51403 }
51404
51405@@ -458,7 +458,8 @@ static int exec_permission_lite(struct inode *inode)
51406 if (!ret)
51407 goto ok;
51408
51409- if (capable(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH))
51410+ if (capable_nolog(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH) ||
51411+ capable(CAP_DAC_OVERRIDE))
51412 goto ok;
51413
51414 return ret;
51415@@ -638,7 +639,7 @@ static __always_inline int __do_follow_link(struct path *path, struct nameidata
51416 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
51417 error = PTR_ERR(cookie);
51418 if (!IS_ERR(cookie)) {
51419- char *s = nd_get_link(nd);
51420+ const char *s = nd_get_link(nd);
51421 error = 0;
51422 if (s)
51423 error = __vfs_follow_link(nd, s);
51424@@ -669,6 +670,13 @@ static inline int do_follow_link(struct path *path, struct nameidata *nd)
51425 err = security_inode_follow_link(path->dentry, nd);
51426 if (err)
51427 goto loop;
51428+
51429+ if (gr_handle_follow_link(path->dentry->d_parent->d_inode,
51430+ path->dentry->d_inode, path->dentry, nd->path.mnt)) {
51431+ err = -EACCES;
51432+ goto loop;
51433+ }
51434+
51435 current->link_count++;
51436 current->total_link_count++;
51437 nd->depth++;
51438@@ -1016,11 +1024,19 @@ return_reval:
51439 break;
51440 }
51441 return_base:
51442+ if (!(nd->flags & (LOOKUP_CONTINUE | LOOKUP_PARENT)) &&
51443+ !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
51444+ path_put(&nd->path);
51445+ return -ENOENT;
51446+ }
51447 return 0;
51448 out_dput:
51449 path_put_conditional(&next, nd);
51450 break;
51451 }
51452+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
51453+ err = -ENOENT;
51454+
51455 path_put(&nd->path);
51456 return_err:
51457 return err;
51458@@ -1091,13 +1107,20 @@ static int do_path_lookup(int dfd, const char *name,
51459 int retval = path_init(dfd, name, flags, nd);
51460 if (!retval)
51461 retval = path_walk(name, nd);
51462- if (unlikely(!retval && !audit_dummy_context() && nd->path.dentry &&
51463- nd->path.dentry->d_inode))
51464- audit_inode(name, nd->path.dentry);
51465+
51466+ if (likely(!retval)) {
51467+ if (nd->path.dentry && nd->path.dentry->d_inode) {
51468+ if (*name != '/' && !gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
51469+ retval = -ENOENT;
51470+ if (!audit_dummy_context())
51471+ audit_inode(name, nd->path.dentry);
51472+ }
51473+ }
51474 if (nd->root.mnt) {
51475 path_put(&nd->root);
51476 nd->root.mnt = NULL;
51477 }
51478+
51479 return retval;
51480 }
51481
51482@@ -1576,6 +1599,20 @@ int may_open(struct path *path, int acc_mode, int flag)
51483 if (error)
51484 goto err_out;
51485
51486+
51487+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode)) {
51488+ error = -EPERM;
51489+ goto err_out;
51490+ }
51491+ if (gr_handle_rawio(inode)) {
51492+ error = -EPERM;
51493+ goto err_out;
51494+ }
51495+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode)) {
51496+ error = -EACCES;
51497+ goto err_out;
51498+ }
51499+
51500 if (flag & O_TRUNC) {
51501 error = get_write_access(inode);
51502 if (error)
51503@@ -1620,6 +1657,17 @@ static int __open_namei_create(struct nameidata *nd, struct path *path,
51504 {
51505 int error;
51506 struct dentry *dir = nd->path.dentry;
51507+ int acc_mode = ACC_MODE(flag);
51508+
51509+ if (flag & O_TRUNC)
51510+ acc_mode |= MAY_WRITE;
51511+ if (flag & O_APPEND)
51512+ acc_mode |= MAY_APPEND;
51513+
51514+ if (!gr_acl_handle_creat(path->dentry, dir, nd->path.mnt, flag, acc_mode, mode)) {
51515+ error = -EACCES;
51516+ goto out_unlock;
51517+ }
51518
51519 if (!IS_POSIXACL(dir->d_inode))
51520 mode &= ~current_umask();
51521@@ -1627,6 +1675,8 @@ static int __open_namei_create(struct nameidata *nd, struct path *path,
51522 if (error)
51523 goto out_unlock;
51524 error = vfs_create(dir->d_inode, path->dentry, mode, nd);
51525+ if (!error)
51526+ gr_handle_create(path->dentry, nd->path.mnt);
51527 out_unlock:
51528 mutex_unlock(&dir->d_inode->i_mutex);
51529 dput(nd->path.dentry);
51530@@ -1709,6 +1759,22 @@ struct file *do_filp_open(int dfd, const char *pathname,
51531 &nd, flag);
51532 if (error)
51533 return ERR_PTR(error);
51534+
51535+ if (gr_handle_rofs_blockwrite(nd.path.dentry, nd.path.mnt, acc_mode)) {
51536+ error = -EPERM;
51537+ goto exit;
51538+ }
51539+
51540+ if (gr_handle_rawio(nd.path.dentry->d_inode)) {
51541+ error = -EPERM;
51542+ goto exit;
51543+ }
51544+
51545+ if (!gr_acl_handle_open(nd.path.dentry, nd.path.mnt, acc_mode)) {
51546+ error = -EACCES;
51547+ goto exit;
51548+ }
51549+
51550 goto ok;
51551 }
51552
51553@@ -1795,6 +1861,19 @@ do_last:
51554 /*
51555 * It already exists.
51556 */
51557+
51558+ if (!gr_acl_handle_hidden_file(path.dentry, path.mnt)) {
51559+ error = -ENOENT;
51560+ goto exit_mutex_unlock;
51561+ }
51562+
51563+ /* only check if O_CREAT is specified, all other checks need
51564+ to go into may_open */
51565+ if (gr_handle_fifo(path.dentry, path.mnt, dir, flag, acc_mode)) {
51566+ error = -EACCES;
51567+ goto exit_mutex_unlock;
51568+ }
51569+
51570 mutex_unlock(&dir->d_inode->i_mutex);
51571 audit_inode(pathname, path.dentry);
51572
51573@@ -1887,6 +1966,13 @@ do_link:
51574 error = security_inode_follow_link(path.dentry, &nd);
51575 if (error)
51576 goto exit_dput;
51577+
51578+ if (gr_handle_follow_link(path.dentry->d_parent->d_inode, path.dentry->d_inode,
51579+ path.dentry, nd.path.mnt)) {
51580+ error = -EACCES;
51581+ goto exit_dput;
51582+ }
51583+
51584 error = __do_follow_link(&path, &nd);
51585 if (error) {
51586 /* Does someone understand code flow here? Or it is only
51587@@ -1984,6 +2070,10 @@ struct dentry *lookup_create(struct nameidata *nd, int is_dir)
51588 }
51589 return dentry;
51590 eexist:
51591+ if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
51592+ dput(dentry);
51593+ return ERR_PTR(-ENOENT);
51594+ }
51595 dput(dentry);
51596 dentry = ERR_PTR(-EEXIST);
51597 fail:
51598@@ -2061,6 +2151,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
51599 error = may_mknod(mode);
51600 if (error)
51601 goto out_dput;
51602+
51603+ if (gr_handle_chroot_mknod(dentry, nd.path.mnt, mode)) {
51604+ error = -EPERM;
51605+ goto out_dput;
51606+ }
51607+
51608+ if (!gr_acl_handle_mknod(dentry, nd.path.dentry, nd.path.mnt, mode)) {
51609+ error = -EACCES;
51610+ goto out_dput;
51611+ }
51612+
51613 error = mnt_want_write(nd.path.mnt);
51614 if (error)
51615 goto out_dput;
51616@@ -2081,6 +2182,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
51617 }
51618 out_drop_write:
51619 mnt_drop_write(nd.path.mnt);
51620+
51621+ if (!error)
51622+ gr_handle_create(dentry, nd.path.mnt);
51623 out_dput:
51624 dput(dentry);
51625 out_unlock:
51626@@ -2134,6 +2238,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
51627 if (IS_ERR(dentry))
51628 goto out_unlock;
51629
51630+ if (!gr_acl_handle_mkdir(dentry, nd.path.dentry, nd.path.mnt)) {
51631+ error = -EACCES;
51632+ goto out_dput;
51633+ }
51634+
51635 if (!IS_POSIXACL(nd.path.dentry->d_inode))
51636 mode &= ~current_umask();
51637 error = mnt_want_write(nd.path.mnt);
51638@@ -2145,6 +2254,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
51639 error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
51640 out_drop_write:
51641 mnt_drop_write(nd.path.mnt);
51642+
51643+ if (!error)
51644+ gr_handle_create(dentry, nd.path.mnt);
51645+
51646 out_dput:
51647 dput(dentry);
51648 out_unlock:
51649@@ -2226,6 +2339,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
51650 char * name;
51651 struct dentry *dentry;
51652 struct nameidata nd;
51653+ ino_t saved_ino = 0;
51654+ dev_t saved_dev = 0;
51655
51656 error = user_path_parent(dfd, pathname, &nd, &name);
51657 if (error)
51658@@ -2250,6 +2365,17 @@ static long do_rmdir(int dfd, const char __user *pathname)
51659 error = PTR_ERR(dentry);
51660 if (IS_ERR(dentry))
51661 goto exit2;
51662+
51663+ if (dentry->d_inode != NULL) {
51664+ saved_ino = dentry->d_inode->i_ino;
51665+ saved_dev = gr_get_dev_from_dentry(dentry);
51666+
51667+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
51668+ error = -EACCES;
51669+ goto exit3;
51670+ }
51671+ }
51672+
51673 error = mnt_want_write(nd.path.mnt);
51674 if (error)
51675 goto exit3;
51676@@ -2257,6 +2383,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
51677 if (error)
51678 goto exit4;
51679 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
51680+ if (!error && (saved_dev || saved_ino))
51681+ gr_handle_delete(saved_ino, saved_dev);
51682 exit4:
51683 mnt_drop_write(nd.path.mnt);
51684 exit3:
51685@@ -2318,6 +2446,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
51686 struct dentry *dentry;
51687 struct nameidata nd;
51688 struct inode *inode = NULL;
51689+ ino_t saved_ino = 0;
51690+ dev_t saved_dev = 0;
51691
51692 error = user_path_parent(dfd, pathname, &nd, &name);
51693 if (error)
51694@@ -2337,8 +2467,19 @@ static long do_unlinkat(int dfd, const char __user *pathname)
51695 if (nd.last.name[nd.last.len])
51696 goto slashes;
51697 inode = dentry->d_inode;
51698- if (inode)
51699+ if (inode) {
51700+ if (inode->i_nlink <= 1) {
51701+ saved_ino = inode->i_ino;
51702+ saved_dev = gr_get_dev_from_dentry(dentry);
51703+ }
51704+
51705 atomic_inc(&inode->i_count);
51706+
51707+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
51708+ error = -EACCES;
51709+ goto exit2;
51710+ }
51711+ }
51712 error = mnt_want_write(nd.path.mnt);
51713 if (error)
51714 goto exit2;
51715@@ -2346,6 +2487,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
51716 if (error)
51717 goto exit3;
51718 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
51719+ if (!error && (saved_ino || saved_dev))
51720+ gr_handle_delete(saved_ino, saved_dev);
51721 exit3:
51722 mnt_drop_write(nd.path.mnt);
51723 exit2:
51724@@ -2424,6 +2567,11 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
51725 if (IS_ERR(dentry))
51726 goto out_unlock;
51727
51728+ if (!gr_acl_handle_symlink(dentry, nd.path.dentry, nd.path.mnt, from)) {
51729+ error = -EACCES;
51730+ goto out_dput;
51731+ }
51732+
51733 error = mnt_want_write(nd.path.mnt);
51734 if (error)
51735 goto out_dput;
51736@@ -2431,6 +2579,8 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
51737 if (error)
51738 goto out_drop_write;
51739 error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
51740+ if (!error)
51741+ gr_handle_create(dentry, nd.path.mnt);
51742 out_drop_write:
51743 mnt_drop_write(nd.path.mnt);
51744 out_dput:
51745@@ -2524,6 +2674,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
51746 error = PTR_ERR(new_dentry);
51747 if (IS_ERR(new_dentry))
51748 goto out_unlock;
51749+
51750+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
51751+ old_path.dentry->d_inode,
51752+ old_path.dentry->d_inode->i_mode, to)) {
51753+ error = -EACCES;
51754+ goto out_dput;
51755+ }
51756+
51757+ if (!gr_acl_handle_link(new_dentry, nd.path.dentry, nd.path.mnt,
51758+ old_path.dentry, old_path.mnt, to)) {
51759+ error = -EACCES;
51760+ goto out_dput;
51761+ }
51762+
51763 error = mnt_want_write(nd.path.mnt);
51764 if (error)
51765 goto out_dput;
51766@@ -2531,6 +2695,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
51767 if (error)
51768 goto out_drop_write;
51769 error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
51770+ if (!error)
51771+ gr_handle_create(new_dentry, nd.path.mnt);
51772 out_drop_write:
51773 mnt_drop_write(nd.path.mnt);
51774 out_dput:
51775@@ -2708,6 +2874,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
51776 char *to;
51777 int error;
51778
51779+ pax_track_stack();
51780+
51781 error = user_path_parent(olddfd, oldname, &oldnd, &from);
51782 if (error)
51783 goto exit;
51784@@ -2764,6 +2932,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
51785 if (new_dentry == trap)
51786 goto exit5;
51787
51788+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
51789+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
51790+ to);
51791+ if (error)
51792+ goto exit5;
51793+
51794 error = mnt_want_write(oldnd.path.mnt);
51795 if (error)
51796 goto exit5;
51797@@ -2773,6 +2947,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
51798 goto exit6;
51799 error = vfs_rename(old_dir->d_inode, old_dentry,
51800 new_dir->d_inode, new_dentry);
51801+ if (!error)
51802+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
51803+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
51804 exit6:
51805 mnt_drop_write(oldnd.path.mnt);
51806 exit5:
51807@@ -2798,6 +2975,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
51808
51809 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
51810 {
51811+ char tmpbuf[64];
51812+ const char *newlink;
51813 int len;
51814
51815 len = PTR_ERR(link);
51816@@ -2807,7 +2986,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
51817 len = strlen(link);
51818 if (len > (unsigned) buflen)
51819 len = buflen;
51820- if (copy_to_user(buffer, link, len))
51821+
51822+ if (len < sizeof(tmpbuf)) {
51823+ memcpy(tmpbuf, link, len);
51824+ newlink = tmpbuf;
51825+ } else
51826+ newlink = link;
51827+
51828+ if (copy_to_user(buffer, newlink, len))
51829 len = -EFAULT;
51830 out:
51831 return len;
51832diff --git a/fs/namespace.c b/fs/namespace.c
51833index 2beb0fb..11a95a5 100644
51834--- a/fs/namespace.c
51835+++ b/fs/namespace.c
51836@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
51837 if (!(sb->s_flags & MS_RDONLY))
51838 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
51839 up_write(&sb->s_umount);
51840+
51841+ gr_log_remount(mnt->mnt_devname, retval);
51842+
51843 return retval;
51844 }
51845
51846@@ -1104,6 +1107,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
51847 security_sb_umount_busy(mnt);
51848 up_write(&namespace_sem);
51849 release_mounts(&umount_list);
51850+
51851+ gr_log_unmount(mnt->mnt_devname, retval);
51852+
51853 return retval;
51854 }
51855
51856@@ -1962,6 +1968,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
51857 if (retval)
51858 goto dput_out;
51859
51860+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
51861+ retval = -EPERM;
51862+ goto dput_out;
51863+ }
51864+
51865+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
51866+ retval = -EPERM;
51867+ goto dput_out;
51868+ }
51869+
51870 if (flags & MS_REMOUNT)
51871 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
51872 data_page);
51873@@ -1976,6 +1992,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
51874 dev_name, data_page);
51875 dput_out:
51876 path_put(&path);
51877+
51878+ gr_log_mount(dev_name, dir_name, retval);
51879+
51880 return retval;
51881 }
51882
51883@@ -2182,6 +2201,12 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
51884 goto out1;
51885 }
51886
51887+ if (gr_handle_chroot_pivot()) {
51888+ error = -EPERM;
51889+ path_put(&old);
51890+ goto out1;
51891+ }
51892+
51893 read_lock(&current->fs->lock);
51894 root = current->fs->root;
51895 path_get(&current->fs->root);
51896diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
51897index b8b5b30..2bd9ccb 100644
51898--- a/fs/ncpfs/dir.c
51899+++ b/fs/ncpfs/dir.c
51900@@ -275,6 +275,8 @@ __ncp_lookup_validate(struct dentry *dentry)
51901 int res, val = 0, len;
51902 __u8 __name[NCP_MAXPATHLEN + 1];
51903
51904+ pax_track_stack();
51905+
51906 parent = dget_parent(dentry);
51907 dir = parent->d_inode;
51908
51909@@ -799,6 +801,8 @@ static struct dentry *ncp_lookup(struct inode *dir, struct dentry *dentry, struc
51910 int error, res, len;
51911 __u8 __name[NCP_MAXPATHLEN + 1];
51912
51913+ pax_track_stack();
51914+
51915 lock_kernel();
51916 error = -EIO;
51917 if (!ncp_conn_valid(server))
51918@@ -883,10 +887,12 @@ int ncp_create_new(struct inode *dir, struct dentry *dentry, int mode,
51919 int error, result, len;
51920 int opmode;
51921 __u8 __name[NCP_MAXPATHLEN + 1];
51922-
51923+
51924 PPRINTK("ncp_create_new: creating %s/%s, mode=%x\n",
51925 dentry->d_parent->d_name.name, dentry->d_name.name, mode);
51926
51927+ pax_track_stack();
51928+
51929 error = -EIO;
51930 lock_kernel();
51931 if (!ncp_conn_valid(server))
51932@@ -952,6 +958,8 @@ static int ncp_mkdir(struct inode *dir, struct dentry *dentry, int mode)
51933 int error, len;
51934 __u8 __name[NCP_MAXPATHLEN + 1];
51935
51936+ pax_track_stack();
51937+
51938 DPRINTK("ncp_mkdir: making %s/%s\n",
51939 dentry->d_parent->d_name.name, dentry->d_name.name);
51940
51941@@ -960,6 +968,8 @@ static int ncp_mkdir(struct inode *dir, struct dentry *dentry, int mode)
51942 if (!ncp_conn_valid(server))
51943 goto out;
51944
51945+ pax_track_stack();
51946+
51947 ncp_age_dentry(server, dentry);
51948 len = sizeof(__name);
51949 error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
51950@@ -1114,6 +1124,8 @@ static int ncp_rename(struct inode *old_dir, struct dentry *old_dentry,
51951 int old_len, new_len;
51952 __u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1];
51953
51954+ pax_track_stack();
51955+
51956 DPRINTK("ncp_rename: %s/%s to %s/%s\n",
51957 old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
51958 new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
51959diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
51960index cf98da1..da890a9 100644
51961--- a/fs/ncpfs/inode.c
51962+++ b/fs/ncpfs/inode.c
51963@@ -445,6 +445,8 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
51964 #endif
51965 struct ncp_entry_info finfo;
51966
51967+ pax_track_stack();
51968+
51969 data.wdog_pid = NULL;
51970 server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
51971 if (!server)
51972diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
51973index bfaef7b..e9d03ca 100644
51974--- a/fs/nfs/inode.c
51975+++ b/fs/nfs/inode.c
51976@@ -156,7 +156,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
51977 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
51978 nfsi->attrtimeo_timestamp = jiffies;
51979
51980- memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
51981+ memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
51982 if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
51983 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
51984 else
51985@@ -973,16 +973,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
51986 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
51987 }
51988
51989-static atomic_long_t nfs_attr_generation_counter;
51990+static atomic_long_unchecked_t nfs_attr_generation_counter;
51991
51992 static unsigned long nfs_read_attr_generation_counter(void)
51993 {
51994- return atomic_long_read(&nfs_attr_generation_counter);
51995+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
51996 }
51997
51998 unsigned long nfs_inc_attr_generation_counter(void)
51999 {
52000- return atomic_long_inc_return(&nfs_attr_generation_counter);
52001+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
52002 }
52003
52004 void nfs_fattr_init(struct nfs_fattr *fattr)
52005diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
52006index cc2f505..f6a236f 100644
52007--- a/fs/nfsd/lockd.c
52008+++ b/fs/nfsd/lockd.c
52009@@ -66,7 +66,7 @@ nlm_fclose(struct file *filp)
52010 fput(filp);
52011 }
52012
52013-static struct nlmsvc_binding nfsd_nlm_ops = {
52014+static const struct nlmsvc_binding nfsd_nlm_ops = {
52015 .fopen = nlm_fopen, /* open file for locking */
52016 .fclose = nlm_fclose, /* close file */
52017 };
52018diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
52019index cfc3391..dcc083a 100644
52020--- a/fs/nfsd/nfs4state.c
52021+++ b/fs/nfsd/nfs4state.c
52022@@ -3459,6 +3459,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
52023 unsigned int cmd;
52024 int err;
52025
52026+ pax_track_stack();
52027+
52028 dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
52029 (long long) lock->lk_offset,
52030 (long long) lock->lk_length);
52031diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
52032index 4a82a96..0d5fb49 100644
52033--- a/fs/nfsd/nfs4xdr.c
52034+++ b/fs/nfsd/nfs4xdr.c
52035@@ -1751,6 +1751,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
52036 struct nfsd4_compoundres *resp = rqstp->rq_resp;
52037 u32 minorversion = resp->cstate.minorversion;
52038
52039+ pax_track_stack();
52040+
52041 BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
52042 BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
52043 BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
52044diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
52045index 2e09588..596421d 100644
52046--- a/fs/nfsd/vfs.c
52047+++ b/fs/nfsd/vfs.c
52048@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
52049 } else {
52050 oldfs = get_fs();
52051 set_fs(KERNEL_DS);
52052- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
52053+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
52054 set_fs(oldfs);
52055 }
52056
52057@@ -1060,7 +1060,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
52058
52059 /* Write the data. */
52060 oldfs = get_fs(); set_fs(KERNEL_DS);
52061- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
52062+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
52063 set_fs(oldfs);
52064 if (host_err < 0)
52065 goto out_nfserr;
52066@@ -1542,7 +1542,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
52067 */
52068
52069 oldfs = get_fs(); set_fs(KERNEL_DS);
52070- host_err = inode->i_op->readlink(dentry, buf, *lenp);
52071+ host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
52072 set_fs(oldfs);
52073
52074 if (host_err < 0)
52075diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
52076index f6af760..d0adf34 100644
52077--- a/fs/nilfs2/ioctl.c
52078+++ b/fs/nilfs2/ioctl.c
52079@@ -480,7 +480,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
52080 unsigned int cmd, void __user *argp)
52081 {
52082 struct nilfs_argv argv[5];
52083- const static size_t argsz[5] = {
52084+ static const size_t argsz[5] = {
52085 sizeof(struct nilfs_vdesc),
52086 sizeof(struct nilfs_period),
52087 sizeof(__u64),
52088@@ -522,6 +522,9 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
52089 if (argv[n].v_nmembs > nsegs * nilfs->ns_blocks_per_segment)
52090 goto out_free;
52091
52092+ if (argv[n].v_nmembs >= UINT_MAX / argv[n].v_size)
52093+ goto out_free;
52094+
52095 len = argv[n].v_size * argv[n].v_nmembs;
52096 base = (void __user *)(unsigned long)argv[n].v_base;
52097 if (len == 0) {
52098diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
52099index 7e54e52..9337248 100644
52100--- a/fs/notify/dnotify/dnotify.c
52101+++ b/fs/notify/dnotify/dnotify.c
52102@@ -173,7 +173,7 @@ static void dnotify_free_mark(struct fsnotify_mark_entry *entry)
52103 kmem_cache_free(dnotify_mark_entry_cache, dnentry);
52104 }
52105
52106-static struct fsnotify_ops dnotify_fsnotify_ops = {
52107+static const struct fsnotify_ops dnotify_fsnotify_ops = {
52108 .handle_event = dnotify_handle_event,
52109 .should_send_event = dnotify_should_send_event,
52110 .free_group_priv = NULL,
52111diff --git a/fs/notify/notification.c b/fs/notify/notification.c
52112index b8bf53b..c518688 100644
52113--- a/fs/notify/notification.c
52114+++ b/fs/notify/notification.c
52115@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
52116 * get set to 0 so it will never get 'freed'
52117 */
52118 static struct fsnotify_event q_overflow_event;
52119-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
52120+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
52121
52122 /**
52123 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
52124@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
52125 */
52126 u32 fsnotify_get_cookie(void)
52127 {
52128- return atomic_inc_return(&fsnotify_sync_cookie);
52129+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
52130 }
52131 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
52132
52133diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
52134index 5a9e344..0f8cd28 100644
52135--- a/fs/ntfs/dir.c
52136+++ b/fs/ntfs/dir.c
52137@@ -1328,7 +1328,7 @@ find_next_index_buffer:
52138 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
52139 ~(s64)(ndir->itype.index.block_size - 1)));
52140 /* Bounds checks. */
52141- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
52142+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
52143 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
52144 "inode 0x%lx or driver bug.", vdir->i_ino);
52145 goto err_out;
52146diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
52147index 663c0e3..b6868e9 100644
52148--- a/fs/ntfs/file.c
52149+++ b/fs/ntfs/file.c
52150@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_inode_ops = {
52151 #endif /* NTFS_RW */
52152 };
52153
52154-const struct file_operations ntfs_empty_file_ops = {};
52155+const struct file_operations ntfs_empty_file_ops __read_only;
52156
52157-const struct inode_operations ntfs_empty_inode_ops = {};
52158+const struct inode_operations ntfs_empty_inode_ops __read_only;
52159diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
52160index 1cd2934..880b5d2 100644
52161--- a/fs/ocfs2/cluster/masklog.c
52162+++ b/fs/ocfs2/cluster/masklog.c
52163@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject *obj, struct attribute *attr,
52164 return mlog_mask_store(mlog_attr->mask, buf, count);
52165 }
52166
52167-static struct sysfs_ops mlog_attr_ops = {
52168+static const struct sysfs_ops mlog_attr_ops = {
52169 .show = mlog_show,
52170 .store = mlog_store,
52171 };
52172diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
52173index ac10f83..2cd2607 100644
52174--- a/fs/ocfs2/localalloc.c
52175+++ b/fs/ocfs2/localalloc.c
52176@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
52177 goto bail;
52178 }
52179
52180- atomic_inc(&osb->alloc_stats.moves);
52181+ atomic_inc_unchecked(&osb->alloc_stats.moves);
52182
52183 status = 0;
52184 bail:
52185diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
52186index f010b22..9f9ed34 100644
52187--- a/fs/ocfs2/namei.c
52188+++ b/fs/ocfs2/namei.c
52189@@ -1043,6 +1043,8 @@ static int ocfs2_rename(struct inode *old_dir,
52190 struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
52191 struct ocfs2_dir_lookup_result target_insert = { NULL, };
52192
52193+ pax_track_stack();
52194+
52195 /* At some point it might be nice to break this function up a
52196 * bit. */
52197
52198diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
52199index d963d86..914cfbd 100644
52200--- a/fs/ocfs2/ocfs2.h
52201+++ b/fs/ocfs2/ocfs2.h
52202@@ -217,11 +217,11 @@ enum ocfs2_vol_state
52203
52204 struct ocfs2_alloc_stats
52205 {
52206- atomic_t moves;
52207- atomic_t local_data;
52208- atomic_t bitmap_data;
52209- atomic_t bg_allocs;
52210- atomic_t bg_extends;
52211+ atomic_unchecked_t moves;
52212+ atomic_unchecked_t local_data;
52213+ atomic_unchecked_t bitmap_data;
52214+ atomic_unchecked_t bg_allocs;
52215+ atomic_unchecked_t bg_extends;
52216 };
52217
52218 enum ocfs2_local_alloc_state
52219diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
52220index 79b5dac..d322952 100644
52221--- a/fs/ocfs2/suballoc.c
52222+++ b/fs/ocfs2/suballoc.c
52223@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
52224 mlog_errno(status);
52225 goto bail;
52226 }
52227- atomic_inc(&osb->alloc_stats.bg_extends);
52228+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
52229
52230 /* You should never ask for this much metadata */
52231 BUG_ON(bits_wanted >
52232@@ -1654,7 +1654,7 @@ int ocfs2_claim_metadata(struct ocfs2_super *osb,
52233 mlog_errno(status);
52234 goto bail;
52235 }
52236- atomic_inc(&osb->alloc_stats.bg_allocs);
52237+ atomic_inc_unchecked(&osb->alloc_stats.bg_allocs);
52238
52239 *blkno_start = bg_blkno + (u64) *suballoc_bit_start;
52240 ac->ac_bits_given += (*num_bits);
52241@@ -1728,7 +1728,7 @@ int ocfs2_claim_new_inode(struct ocfs2_super *osb,
52242 mlog_errno(status);
52243 goto bail;
52244 }
52245- atomic_inc(&osb->alloc_stats.bg_allocs);
52246+ atomic_inc_unchecked(&osb->alloc_stats.bg_allocs);
52247
52248 BUG_ON(num_bits != 1);
52249
52250@@ -1830,7 +1830,7 @@ int __ocfs2_claim_clusters(struct ocfs2_super *osb,
52251 cluster_start,
52252 num_clusters);
52253 if (!status)
52254- atomic_inc(&osb->alloc_stats.local_data);
52255+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
52256 } else {
52257 if (min_clusters > (osb->bitmap_cpg - 1)) {
52258 /* The only paths asking for contiguousness
52259@@ -1858,7 +1858,7 @@ int __ocfs2_claim_clusters(struct ocfs2_super *osb,
52260 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
52261 bg_blkno,
52262 bg_bit_off);
52263- atomic_inc(&osb->alloc_stats.bitmap_data);
52264+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
52265 }
52266 }
52267 if (status < 0) {
52268diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
52269index 9f55be4..a3f8048 100644
52270--- a/fs/ocfs2/super.c
52271+++ b/fs/ocfs2/super.c
52272@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
52273 "%10s => GlobalAllocs: %d LocalAllocs: %d "
52274 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
52275 "Stats",
52276- atomic_read(&osb->alloc_stats.bitmap_data),
52277- atomic_read(&osb->alloc_stats.local_data),
52278- atomic_read(&osb->alloc_stats.bg_allocs),
52279- atomic_read(&osb->alloc_stats.moves),
52280- atomic_read(&osb->alloc_stats.bg_extends));
52281+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
52282+ atomic_read_unchecked(&osb->alloc_stats.local_data),
52283+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
52284+ atomic_read_unchecked(&osb->alloc_stats.moves),
52285+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
52286
52287 out += snprintf(buf + out, len - out,
52288 "%10s => State: %u Descriptor: %llu Size: %u bits "
52289@@ -2002,11 +2002,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
52290 spin_lock_init(&osb->osb_xattr_lock);
52291 ocfs2_init_inode_steal_slot(osb);
52292
52293- atomic_set(&osb->alloc_stats.moves, 0);
52294- atomic_set(&osb->alloc_stats.local_data, 0);
52295- atomic_set(&osb->alloc_stats.bitmap_data, 0);
52296- atomic_set(&osb->alloc_stats.bg_allocs, 0);
52297- atomic_set(&osb->alloc_stats.bg_extends, 0);
52298+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
52299+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
52300+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
52301+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
52302+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
52303
52304 /* Copy the blockcheck stats from the superblock probe */
52305 osb->osb_ecc_stats = *stats;
52306diff --git a/fs/open.c b/fs/open.c
52307index 4f01e06..091f6c3 100644
52308--- a/fs/open.c
52309+++ b/fs/open.c
52310@@ -275,6 +275,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
52311 error = locks_verify_truncate(inode, NULL, length);
52312 if (!error)
52313 error = security_path_truncate(&path, length, 0);
52314+
52315+ if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
52316+ error = -EACCES;
52317+
52318 if (!error) {
52319 vfs_dq_init(inode);
52320 error = do_truncate(path.dentry, length, 0, NULL);
52321@@ -511,6 +515,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
52322 if (__mnt_is_readonly(path.mnt))
52323 res = -EROFS;
52324
52325+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
52326+ res = -EACCES;
52327+
52328 out_path_release:
52329 path_put(&path);
52330 out:
52331@@ -537,6 +544,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
52332 if (error)
52333 goto dput_and_out;
52334
52335+ gr_log_chdir(path.dentry, path.mnt);
52336+
52337 set_fs_pwd(current->fs, &path);
52338
52339 dput_and_out:
52340@@ -563,6 +572,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
52341 goto out_putf;
52342
52343 error = inode_permission(inode, MAY_EXEC | MAY_ACCESS);
52344+
52345+ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
52346+ error = -EPERM;
52347+
52348+ if (!error)
52349+ gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
52350+
52351 if (!error)
52352 set_fs_pwd(current->fs, &file->f_path);
52353 out_putf:
52354@@ -588,7 +604,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
52355 if (!capable(CAP_SYS_CHROOT))
52356 goto dput_and_out;
52357
52358+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
52359+ goto dput_and_out;
52360+
52361 set_fs_root(current->fs, &path);
52362+
52363+ gr_handle_chroot_chdir(&path);
52364+
52365 error = 0;
52366 dput_and_out:
52367 path_put(&path);
52368@@ -616,12 +638,27 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, mode_t, mode)
52369 err = mnt_want_write_file(file);
52370 if (err)
52371 goto out_putf;
52372+
52373 mutex_lock(&inode->i_mutex);
52374+
52375+ if (!gr_acl_handle_fchmod(dentry, file->f_path.mnt, mode)) {
52376+ err = -EACCES;
52377+ goto out_unlock;
52378+ }
52379+
52380 if (mode == (mode_t) -1)
52381 mode = inode->i_mode;
52382+
52383+ if (gr_handle_chroot_chmod(dentry, file->f_path.mnt, mode)) {
52384+ err = -EPERM;
52385+ goto out_unlock;
52386+ }
52387+
52388 newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
52389 newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
52390 err = notify_change(dentry, &newattrs);
52391+
52392+out_unlock:
52393 mutex_unlock(&inode->i_mutex);
52394 mnt_drop_write(file->f_path.mnt);
52395 out_putf:
52396@@ -645,12 +682,27 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode)
52397 error = mnt_want_write(path.mnt);
52398 if (error)
52399 goto dput_and_out;
52400+
52401 mutex_lock(&inode->i_mutex);
52402+
52403+ if (!gr_acl_handle_chmod(path.dentry, path.mnt, mode)) {
52404+ error = -EACCES;
52405+ goto out_unlock;
52406+ }
52407+
52408 if (mode == (mode_t) -1)
52409 mode = inode->i_mode;
52410+
52411+ if (gr_handle_chroot_chmod(path.dentry, path.mnt, mode)) {
52412+ error = -EACCES;
52413+ goto out_unlock;
52414+ }
52415+
52416 newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
52417 newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
52418 error = notify_change(path.dentry, &newattrs);
52419+
52420+out_unlock:
52421 mutex_unlock(&inode->i_mutex);
52422 mnt_drop_write(path.mnt);
52423 dput_and_out:
52424@@ -664,12 +716,15 @@ SYSCALL_DEFINE2(chmod, const char __user *, filename, mode_t, mode)
52425 return sys_fchmodat(AT_FDCWD, filename, mode);
52426 }
52427
52428-static int chown_common(struct dentry * dentry, uid_t user, gid_t group)
52429+static int chown_common(struct dentry * dentry, uid_t user, gid_t group, struct vfsmount *mnt)
52430 {
52431 struct inode *inode = dentry->d_inode;
52432 int error;
52433 struct iattr newattrs;
52434
52435+ if (!gr_acl_handle_chown(dentry, mnt))
52436+ return -EACCES;
52437+
52438 newattrs.ia_valid = ATTR_CTIME;
52439 if (user != (uid_t) -1) {
52440 newattrs.ia_valid |= ATTR_UID;
52441@@ -700,7 +755,7 @@ SYSCALL_DEFINE3(chown, const char __user *, filename, uid_t, user, gid_t, group)
52442 error = mnt_want_write(path.mnt);
52443 if (error)
52444 goto out_release;
52445- error = chown_common(path.dentry, user, group);
52446+ error = chown_common(path.dentry, user, group, path.mnt);
52447 mnt_drop_write(path.mnt);
52448 out_release:
52449 path_put(&path);
52450@@ -725,7 +780,7 @@ SYSCALL_DEFINE5(fchownat, int, dfd, const char __user *, filename, uid_t, user,
52451 error = mnt_want_write(path.mnt);
52452 if (error)
52453 goto out_release;
52454- error = chown_common(path.dentry, user, group);
52455+ error = chown_common(path.dentry, user, group, path.mnt);
52456 mnt_drop_write(path.mnt);
52457 out_release:
52458 path_put(&path);
52459@@ -744,7 +799,7 @@ SYSCALL_DEFINE3(lchown, const char __user *, filename, uid_t, user, gid_t, group
52460 error = mnt_want_write(path.mnt);
52461 if (error)
52462 goto out_release;
52463- error = chown_common(path.dentry, user, group);
52464+ error = chown_common(path.dentry, user, group, path.mnt);
52465 mnt_drop_write(path.mnt);
52466 out_release:
52467 path_put(&path);
52468@@ -767,7 +822,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd, uid_t, user, gid_t, group)
52469 goto out_fput;
52470 dentry = file->f_path.dentry;
52471 audit_inode(NULL, dentry);
52472- error = chown_common(dentry, user, group);
52473+ error = chown_common(dentry, user, group, file->f_path.mnt);
52474 mnt_drop_write(file->f_path.mnt);
52475 out_fput:
52476 fput(file);
52477@@ -1036,7 +1091,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode)
52478 if (!IS_ERR(tmp)) {
52479 fd = get_unused_fd_flags(flags);
52480 if (fd >= 0) {
52481- struct file *f = do_filp_open(dfd, tmp, flags, mode, 0);
52482+ struct file *f = do_filp_open(dfd, tmp, flags, mode, 0);
52483 if (IS_ERR(f)) {
52484 put_unused_fd(fd);
52485 fd = PTR_ERR(f);
52486diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
52487index 6ab70f4..f4103d1 100644
52488--- a/fs/partitions/efi.c
52489+++ b/fs/partitions/efi.c
52490@@ -231,14 +231,14 @@ alloc_read_gpt_entries(struct block_device *bdev, gpt_header *gpt)
52491 if (!bdev || !gpt)
52492 return NULL;
52493
52494+ if (!le32_to_cpu(gpt->num_partition_entries))
52495+ return NULL;
52496+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
52497+ if (!pte)
52498+ return NULL;
52499+
52500 count = le32_to_cpu(gpt->num_partition_entries) *
52501 le32_to_cpu(gpt->sizeof_partition_entry);
52502- if (!count)
52503- return NULL;
52504- pte = kzalloc(count, GFP_KERNEL);
52505- if (!pte)
52506- return NULL;
52507-
52508 if (read_lba(bdev, le64_to_cpu(gpt->partition_entry_lba),
52509 (u8 *) pte,
52510 count) < count) {
52511diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
52512index dd6efdb..3babc6c 100644
52513--- a/fs/partitions/ldm.c
52514+++ b/fs/partitions/ldm.c
52515@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
52516 ldm_error ("A VBLK claims to have %d parts.", num);
52517 return false;
52518 }
52519+
52520 if (rec >= num) {
52521 ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num);
52522 return false;
52523@@ -1322,7 +1323,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
52524 goto found;
52525 }
52526
52527- f = kmalloc (sizeof (*f) + size*num, GFP_KERNEL);
52528+ f = kmalloc (size*num + sizeof (*f), GFP_KERNEL);
52529 if (!f) {
52530 ldm_crit ("Out of memory.");
52531 return false;
52532diff --git a/fs/partitions/mac.c b/fs/partitions/mac.c
52533index 5765198..7f8e9e0 100644
52534--- a/fs/partitions/mac.c
52535+++ b/fs/partitions/mac.c
52536@@ -59,11 +59,11 @@ int mac_partition(struct parsed_partitions *state, struct block_device *bdev)
52537 return 0; /* not a MacOS disk */
52538 }
52539 blocks_in_map = be32_to_cpu(part->map_count);
52540- if (blocks_in_map < 0 || blocks_in_map >= DISK_MAX_PARTS) {
52541- put_dev_sector(sect);
52542- return 0;
52543- }
52544 printk(" [mac]");
52545+ if (blocks_in_map < 0 || blocks_in_map >= DISK_MAX_PARTS) {
52546+ put_dev_sector(sect);
52547+ return 0;
52548+ }
52549 for (slot = 1; slot <= blocks_in_map; ++slot) {
52550 int pos = slot * secsize;
52551 put_dev_sector(sect);
52552diff --git a/fs/pipe.c b/fs/pipe.c
52553index d0cc080..8a6f211 100644
52554--- a/fs/pipe.c
52555+++ b/fs/pipe.c
52556@@ -401,9 +401,9 @@ redo:
52557 }
52558 if (bufs) /* More to do? */
52559 continue;
52560- if (!pipe->writers)
52561+ if (!atomic_read(&pipe->writers))
52562 break;
52563- if (!pipe->waiting_writers) {
52564+ if (!atomic_read(&pipe->waiting_writers)) {
52565 /* syscall merging: Usually we must not sleep
52566 * if O_NONBLOCK is set, or if we got some data.
52567 * But if a writer sleeps in kernel space, then
52568@@ -462,7 +462,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
52569 mutex_lock(&inode->i_mutex);
52570 pipe = inode->i_pipe;
52571
52572- if (!pipe->readers) {
52573+ if (!atomic_read(&pipe->readers)) {
52574 send_sig(SIGPIPE, current, 0);
52575 ret = -EPIPE;
52576 goto out;
52577@@ -511,7 +511,7 @@ redo1:
52578 for (;;) {
52579 int bufs;
52580
52581- if (!pipe->readers) {
52582+ if (!atomic_read(&pipe->readers)) {
52583 send_sig(SIGPIPE, current, 0);
52584 if (!ret)
52585 ret = -EPIPE;
52586@@ -597,9 +597,9 @@ redo2:
52587 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
52588 do_wakeup = 0;
52589 }
52590- pipe->waiting_writers++;
52591+ atomic_inc(&pipe->waiting_writers);
52592 pipe_wait(pipe);
52593- pipe->waiting_writers--;
52594+ atomic_dec(&pipe->waiting_writers);
52595 }
52596 out:
52597 mutex_unlock(&inode->i_mutex);
52598@@ -666,7 +666,7 @@ pipe_poll(struct file *filp, poll_table *wait)
52599 mask = 0;
52600 if (filp->f_mode & FMODE_READ) {
52601 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
52602- if (!pipe->writers && filp->f_version != pipe->w_counter)
52603+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
52604 mask |= POLLHUP;
52605 }
52606
52607@@ -676,7 +676,7 @@ pipe_poll(struct file *filp, poll_table *wait)
52608 * Most Unices do not set POLLERR for FIFOs but on Linux they
52609 * behave exactly like pipes for poll().
52610 */
52611- if (!pipe->readers)
52612+ if (!atomic_read(&pipe->readers))
52613 mask |= POLLERR;
52614 }
52615
52616@@ -690,10 +690,10 @@ pipe_release(struct inode *inode, int decr, int decw)
52617
52618 mutex_lock(&inode->i_mutex);
52619 pipe = inode->i_pipe;
52620- pipe->readers -= decr;
52621- pipe->writers -= decw;
52622+ atomic_sub(decr, &pipe->readers);
52623+ atomic_sub(decw, &pipe->writers);
52624
52625- if (!pipe->readers && !pipe->writers) {
52626+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
52627 free_pipe_info(inode);
52628 } else {
52629 wake_up_interruptible_sync(&pipe->wait);
52630@@ -783,7 +783,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
52631
52632 if (inode->i_pipe) {
52633 ret = 0;
52634- inode->i_pipe->readers++;
52635+ atomic_inc(&inode->i_pipe->readers);
52636 }
52637
52638 mutex_unlock(&inode->i_mutex);
52639@@ -800,7 +800,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
52640
52641 if (inode->i_pipe) {
52642 ret = 0;
52643- inode->i_pipe->writers++;
52644+ atomic_inc(&inode->i_pipe->writers);
52645 }
52646
52647 mutex_unlock(&inode->i_mutex);
52648@@ -818,9 +818,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
52649 if (inode->i_pipe) {
52650 ret = 0;
52651 if (filp->f_mode & FMODE_READ)
52652- inode->i_pipe->readers++;
52653+ atomic_inc(&inode->i_pipe->readers);
52654 if (filp->f_mode & FMODE_WRITE)
52655- inode->i_pipe->writers++;
52656+ atomic_inc(&inode->i_pipe->writers);
52657 }
52658
52659 mutex_unlock(&inode->i_mutex);
52660@@ -905,7 +905,7 @@ void free_pipe_info(struct inode *inode)
52661 inode->i_pipe = NULL;
52662 }
52663
52664-static struct vfsmount *pipe_mnt __read_mostly;
52665+struct vfsmount *pipe_mnt __read_mostly;
52666 static int pipefs_delete_dentry(struct dentry *dentry)
52667 {
52668 /*
52669@@ -945,7 +945,8 @@ static struct inode * get_pipe_inode(void)
52670 goto fail_iput;
52671 inode->i_pipe = pipe;
52672
52673- pipe->readers = pipe->writers = 1;
52674+ atomic_set(&pipe->readers, 1);
52675+ atomic_set(&pipe->writers, 1);
52676 inode->i_fop = &rdwr_pipefifo_fops;
52677
52678 /*
52679diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
52680index 50f8f06..c5755df 100644
52681--- a/fs/proc/Kconfig
52682+++ b/fs/proc/Kconfig
52683@@ -30,12 +30,12 @@ config PROC_FS
52684
52685 config PROC_KCORE
52686 bool "/proc/kcore support" if !ARM
52687- depends on PROC_FS && MMU
52688+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
52689
52690 config PROC_VMCORE
52691 bool "/proc/vmcore support (EXPERIMENTAL)"
52692- depends on PROC_FS && CRASH_DUMP
52693- default y
52694+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
52695+ default n
52696 help
52697 Exports the dump image of crashed kernel in ELF format.
52698
52699@@ -59,8 +59,8 @@ config PROC_SYSCTL
52700 limited in memory.
52701
52702 config PROC_PAGE_MONITOR
52703- default y
52704- depends on PROC_FS && MMU
52705+ default n
52706+ depends on PROC_FS && MMU && !GRKERNSEC
52707 bool "Enable /proc page monitoring" if EMBEDDED
52708 help
52709 Various /proc files exist to monitor process memory utilization:
52710diff --git a/fs/proc/array.c b/fs/proc/array.c
52711index c5ef152..24a1b87 100644
52712--- a/fs/proc/array.c
52713+++ b/fs/proc/array.c
52714@@ -60,6 +60,7 @@
52715 #include <linux/tty.h>
52716 #include <linux/string.h>
52717 #include <linux/mman.h>
52718+#include <linux/grsecurity.h>
52719 #include <linux/proc_fs.h>
52720 #include <linux/ioport.h>
52721 #include <linux/uaccess.h>
52722@@ -321,6 +322,21 @@ static inline void task_context_switch_counts(struct seq_file *m,
52723 p->nivcsw);
52724 }
52725
52726+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
52727+static inline void task_pax(struct seq_file *m, struct task_struct *p)
52728+{
52729+ if (p->mm)
52730+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
52731+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
52732+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
52733+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
52734+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
52735+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
52736+ else
52737+ seq_printf(m, "PaX:\t-----\n");
52738+}
52739+#endif
52740+
52741 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
52742 struct pid *pid, struct task_struct *task)
52743 {
52744@@ -337,9 +353,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
52745 task_cap(m, task);
52746 cpuset_task_status_allowed(m, task);
52747 task_context_switch_counts(m, task);
52748+
52749+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
52750+ task_pax(m, task);
52751+#endif
52752+
52753+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
52754+ task_grsec_rbac(m, task);
52755+#endif
52756+
52757 return 0;
52758 }
52759
52760+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52761+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
52762+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
52763+ _mm->pax_flags & MF_PAX_SEGMEXEC))
52764+#endif
52765+
52766 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
52767 struct pid *pid, struct task_struct *task, int whole)
52768 {
52769@@ -358,9 +389,18 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
52770 cputime_t cutime, cstime, utime, stime;
52771 cputime_t cgtime, gtime;
52772 unsigned long rsslim = 0;
52773- char tcomm[sizeof(task->comm)];
52774+ char tcomm[sizeof(task->comm)] = { 0 };
52775 unsigned long flags;
52776
52777+ pax_track_stack();
52778+
52779+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52780+ if (current->exec_id != m->exec_id) {
52781+ gr_log_badprocpid("stat");
52782+ return 0;
52783+ }
52784+#endif
52785+
52786 state = *get_task_state(task);
52787 vsize = eip = esp = 0;
52788 permitted = ptrace_may_access(task, PTRACE_MODE_READ);
52789@@ -433,6 +473,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
52790 gtime = task_gtime(task);
52791 }
52792
52793+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52794+ if (PAX_RAND_FLAGS(mm)) {
52795+ eip = 0;
52796+ esp = 0;
52797+ wchan = 0;
52798+ }
52799+#endif
52800+#ifdef CONFIG_GRKERNSEC_HIDESYM
52801+ wchan = 0;
52802+ eip =0;
52803+ esp =0;
52804+#endif
52805+
52806 /* scale priority and nice values from timeslices to -20..20 */
52807 /* to make it look like a "normal" Unix priority/nice value */
52808 priority = task_prio(task);
52809@@ -473,9 +526,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
52810 vsize,
52811 mm ? get_mm_rss(mm) : 0,
52812 rsslim,
52813+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52814+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
52815+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
52816+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
52817+#else
52818 mm ? (permitted ? mm->start_code : 1) : 0,
52819 mm ? (permitted ? mm->end_code : 1) : 0,
52820 (permitted && mm) ? mm->start_stack : 0,
52821+#endif
52822 esp,
52823 eip,
52824 /* The signal information here is obsolete.
52825@@ -519,6 +578,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
52826 int size = 0, resident = 0, shared = 0, text = 0, lib = 0, data = 0;
52827 struct mm_struct *mm = get_task_mm(task);
52828
52829+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52830+ if (current->exec_id != m->exec_id) {
52831+ gr_log_badprocpid("statm");
52832+ return 0;
52833+ }
52834+#endif
52835+
52836 if (mm) {
52837 size = task_statm(mm, &shared, &text, &data, &resident);
52838 mmput(mm);
52839@@ -528,3 +594,18 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
52840
52841 return 0;
52842 }
52843+
52844+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
52845+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
52846+{
52847+ u32 curr_ip = 0;
52848+ unsigned long flags;
52849+
52850+ if (lock_task_sighand(task, &flags)) {
52851+ curr_ip = task->signal->curr_ip;
52852+ unlock_task_sighand(task, &flags);
52853+ }
52854+
52855+ return sprintf(buffer, "%pI4\n", &curr_ip);
52856+}
52857+#endif
52858diff --git a/fs/proc/base.c b/fs/proc/base.c
52859index 67f7dc0..67ab883 100644
52860--- a/fs/proc/base.c
52861+++ b/fs/proc/base.c
52862@@ -102,6 +102,22 @@ struct pid_entry {
52863 union proc_op op;
52864 };
52865
52866+struct getdents_callback {
52867+ struct linux_dirent __user * current_dir;
52868+ struct linux_dirent __user * previous;
52869+ struct file * file;
52870+ int count;
52871+ int error;
52872+};
52873+
52874+static int gr_fake_filldir(void * __buf, const char *name, int namlen,
52875+ loff_t offset, u64 ino, unsigned int d_type)
52876+{
52877+ struct getdents_callback * buf = (struct getdents_callback *) __buf;
52878+ buf->error = -EINVAL;
52879+ return 0;
52880+}
52881+
52882 #define NOD(NAME, MODE, IOP, FOP, OP) { \
52883 .name = (NAME), \
52884 .len = sizeof(NAME) - 1, \
52885@@ -213,6 +229,9 @@ static int check_mem_permission(struct task_struct *task)
52886 if (task == current)
52887 return 0;
52888
52889+ if (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))
52890+ return -EPERM;
52891+
52892 /*
52893 * If current is actively ptrace'ing, and would also be
52894 * permitted to freshly attach with ptrace now, permit it.
52895@@ -260,6 +279,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
52896 if (!mm->arg_end)
52897 goto out_mm; /* Shh! No looking before we're done */
52898
52899+ if (gr_acl_handle_procpidmem(task))
52900+ goto out_mm;
52901+
52902 len = mm->arg_end - mm->arg_start;
52903
52904 if (len > PAGE_SIZE)
52905@@ -287,12 +309,28 @@ out:
52906 return res;
52907 }
52908
52909+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52910+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
52911+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
52912+ _mm->pax_flags & MF_PAX_SEGMEXEC))
52913+#endif
52914+
52915 static int proc_pid_auxv(struct task_struct *task, char *buffer)
52916 {
52917 int res = 0;
52918 struct mm_struct *mm = get_task_mm(task);
52919 if (mm) {
52920 unsigned int nwords = 0;
52921+
52922+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52923+ /* allow if we're currently ptracing this task */
52924+ if (PAX_RAND_FLAGS(mm) &&
52925+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
52926+ mmput(mm);
52927+ return 0;
52928+ }
52929+#endif
52930+
52931 do {
52932 nwords += 2;
52933 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
52934@@ -306,7 +344,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
52935 }
52936
52937
52938-#ifdef CONFIG_KALLSYMS
52939+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
52940 /*
52941 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
52942 * Returns the resolved symbol. If that fails, simply return the address.
52943@@ -345,7 +383,7 @@ static void unlock_trace(struct task_struct *task)
52944 mutex_unlock(&task->cred_guard_mutex);
52945 }
52946
52947-#ifdef CONFIG_STACKTRACE
52948+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
52949
52950 #define MAX_STACK_TRACE_DEPTH 64
52951
52952@@ -545,7 +583,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
52953 return count;
52954 }
52955
52956-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
52957+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
52958 static int proc_pid_syscall(struct task_struct *task, char *buffer)
52959 {
52960 long nr;
52961@@ -574,7 +612,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
52962 /************************************************************************/
52963
52964 /* permission checks */
52965-static int proc_fd_access_allowed(struct inode *inode)
52966+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
52967 {
52968 struct task_struct *task;
52969 int allowed = 0;
52970@@ -584,7 +622,10 @@ static int proc_fd_access_allowed(struct inode *inode)
52971 */
52972 task = get_proc_task(inode);
52973 if (task) {
52974- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
52975+ if (log)
52976+ allowed = ptrace_may_access_log(task, PTRACE_MODE_READ);
52977+ else
52978+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
52979 put_task_struct(task);
52980 }
52981 return allowed;
52982@@ -809,6 +850,8 @@ static int mem_open(struct inode* inode, struct file* file)
52983 return 0;
52984 }
52985
52986+static int task_dumpable(struct task_struct *task);
52987+
52988 static ssize_t mem_read(struct file * file, char __user * buf,
52989 size_t count, loff_t *ppos)
52990 {
52991@@ -824,6 +867,12 @@ static ssize_t mem_read(struct file * file, char __user * buf,
52992 if (check_mem_permission(task))
52993 goto out;
52994
52995+ // XXX: temporary workaround
52996+ if (!task_dumpable(task) && task == current) {
52997+ ret = -EACCES;
52998+ goto out;
52999+ }
53000+
53001 ret = -ENOMEM;
53002 page = (char *)__get_free_page(GFP_TEMPORARY);
53003 if (!page)
53004@@ -963,6 +1012,9 @@ static ssize_t environ_read(struct file *file, char __user *buf,
53005 if (!task)
53006 goto out_no_task;
53007
53008+ if (gr_acl_handle_procpidmem(task))
53009+ goto out;
53010+
53011 if (!ptrace_may_access(task, PTRACE_MODE_READ))
53012 goto out;
53013
53014@@ -1377,7 +1429,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
53015 path_put(&nd->path);
53016
53017 /* Are we allowed to snoop on the tasks file descriptors? */
53018- if (!proc_fd_access_allowed(inode))
53019+ if (!proc_fd_access_allowed(inode,0))
53020 goto out;
53021
53022 error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
53023@@ -1417,8 +1469,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
53024 struct path path;
53025
53026 /* Are we allowed to snoop on the tasks file descriptors? */
53027- if (!proc_fd_access_allowed(inode))
53028- goto out;
53029+ /* logging this is needed for learning on chromium to work properly,
53030+ but we don't want to flood the logs from 'ps' which does a readlink
53031+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
53032+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
53033+ */
53034+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
53035+ if (!proc_fd_access_allowed(inode,0))
53036+ goto out;
53037+ } else {
53038+ if (!proc_fd_access_allowed(inode,1))
53039+ goto out;
53040+ }
53041
53042 error = PROC_I(inode)->op.proc_get_link(inode, &path);
53043 if (error)
53044@@ -1483,7 +1545,11 @@ static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_st
53045 rcu_read_lock();
53046 cred = __task_cred(task);
53047 inode->i_uid = cred->euid;
53048+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
53049+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
53050+#else
53051 inode->i_gid = cred->egid;
53052+#endif
53053 rcu_read_unlock();
53054 }
53055 security_task_to_inode(task, inode);
53056@@ -1501,6 +1567,9 @@ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat
53057 struct inode *inode = dentry->d_inode;
53058 struct task_struct *task;
53059 const struct cred *cred;
53060+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53061+ const struct cred *tmpcred = current_cred();
53062+#endif
53063
53064 generic_fillattr(inode, stat);
53065
53066@@ -1508,13 +1577,41 @@ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat
53067 stat->uid = 0;
53068 stat->gid = 0;
53069 task = pid_task(proc_pid(inode), PIDTYPE_PID);
53070+
53071+ if (task && (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))) {
53072+ rcu_read_unlock();
53073+ return -ENOENT;
53074+ }
53075+
53076 if (task) {
53077+ cred = __task_cred(task);
53078+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53079+ if (!tmpcred->uid || (tmpcred->uid == cred->uid)
53080+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
53081+ || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
53082+#endif
53083+ ) {
53084+#endif
53085 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
53086+#ifdef CONFIG_GRKERNSEC_PROC_USER
53087+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
53088+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53089+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
53090+#endif
53091 task_dumpable(task)) {
53092- cred = __task_cred(task);
53093 stat->uid = cred->euid;
53094+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
53095+ stat->gid = CONFIG_GRKERNSEC_PROC_GID;
53096+#else
53097 stat->gid = cred->egid;
53098+#endif
53099 }
53100+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53101+ } else {
53102+ rcu_read_unlock();
53103+ return -ENOENT;
53104+ }
53105+#endif
53106 }
53107 rcu_read_unlock();
53108 return 0;
53109@@ -1545,11 +1642,20 @@ static int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
53110
53111 if (task) {
53112 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
53113+#ifdef CONFIG_GRKERNSEC_PROC_USER
53114+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
53115+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53116+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
53117+#endif
53118 task_dumpable(task)) {
53119 rcu_read_lock();
53120 cred = __task_cred(task);
53121 inode->i_uid = cred->euid;
53122+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
53123+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
53124+#else
53125 inode->i_gid = cred->egid;
53126+#endif
53127 rcu_read_unlock();
53128 } else {
53129 inode->i_uid = 0;
53130@@ -1670,7 +1776,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
53131 int fd = proc_fd(inode);
53132
53133 if (task) {
53134- files = get_files_struct(task);
53135+ if (!gr_acl_handle_procpidmem(task))
53136+ files = get_files_struct(task);
53137 put_task_struct(task);
53138 }
53139 if (files) {
53140@@ -1922,12 +2029,22 @@ static const struct file_operations proc_fd_operations = {
53141 static int proc_fd_permission(struct inode *inode, int mask)
53142 {
53143 int rv;
53144+ struct task_struct *task;
53145
53146 rv = generic_permission(inode, mask, NULL);
53147- if (rv == 0)
53148- return 0;
53149+
53150 if (task_pid(current) == proc_pid(inode))
53151 rv = 0;
53152+
53153+ task = get_proc_task(inode);
53154+ if (task == NULL)
53155+ return rv;
53156+
53157+ if (gr_acl_handle_procpidmem(task))
53158+ rv = -EACCES;
53159+
53160+ put_task_struct(task);
53161+
53162 return rv;
53163 }
53164
53165@@ -2036,6 +2153,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
53166 if (!task)
53167 goto out_no_task;
53168
53169+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
53170+ goto out;
53171+
53172 /*
53173 * Yes, it does not scale. And it should not. Don't add
53174 * new entries into /proc/<tgid>/ without very good reasons.
53175@@ -2080,6 +2200,9 @@ static int proc_pident_readdir(struct file *filp,
53176 if (!task)
53177 goto out_no_task;
53178
53179+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
53180+ goto out;
53181+
53182 ret = 0;
53183 i = filp->f_pos;
53184 switch (i) {
53185@@ -2347,7 +2470,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
53186 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
53187 void *cookie)
53188 {
53189- char *s = nd_get_link(nd);
53190+ const char *s = nd_get_link(nd);
53191 if (!IS_ERR(s))
53192 __putname(s);
53193 }
53194@@ -2553,7 +2676,7 @@ static const struct pid_entry tgid_base_stuff[] = {
53195 #ifdef CONFIG_SCHED_DEBUG
53196 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
53197 #endif
53198-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
53199+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
53200 INF("syscall", S_IRUGO, proc_pid_syscall),
53201 #endif
53202 INF("cmdline", S_IRUGO, proc_pid_cmdline),
53203@@ -2578,10 +2701,10 @@ static const struct pid_entry tgid_base_stuff[] = {
53204 #ifdef CONFIG_SECURITY
53205 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
53206 #endif
53207-#ifdef CONFIG_KALLSYMS
53208+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
53209 INF("wchan", S_IRUGO, proc_pid_wchan),
53210 #endif
53211-#ifdef CONFIG_STACKTRACE
53212+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
53213 ONE("stack", S_IRUGO, proc_pid_stack),
53214 #endif
53215 #ifdef CONFIG_SCHEDSTATS
53216@@ -2611,6 +2734,9 @@ static const struct pid_entry tgid_base_stuff[] = {
53217 #ifdef CONFIG_TASK_IO_ACCOUNTING
53218 INF("io", S_IRUSR, proc_tgid_io_accounting),
53219 #endif
53220+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
53221+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
53222+#endif
53223 };
53224
53225 static int proc_tgid_base_readdir(struct file * filp,
53226@@ -2735,7 +2861,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
53227 if (!inode)
53228 goto out;
53229
53230+#ifdef CONFIG_GRKERNSEC_PROC_USER
53231+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
53232+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53233+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
53234+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
53235+#else
53236 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
53237+#endif
53238 inode->i_op = &proc_tgid_base_inode_operations;
53239 inode->i_fop = &proc_tgid_base_operations;
53240 inode->i_flags|=S_IMMUTABLE;
53241@@ -2777,7 +2910,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
53242 if (!task)
53243 goto out;
53244
53245+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
53246+ goto out_put_task;
53247+
53248 result = proc_pid_instantiate(dir, dentry, task, NULL);
53249+out_put_task:
53250 put_task_struct(task);
53251 out:
53252 return result;
53253@@ -2842,6 +2979,11 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
53254 {
53255 unsigned int nr;
53256 struct task_struct *reaper;
53257+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53258+ const struct cred *tmpcred = current_cred();
53259+ const struct cred *itercred;
53260+#endif
53261+ filldir_t __filldir = filldir;
53262 struct tgid_iter iter;
53263 struct pid_namespace *ns;
53264
53265@@ -2865,8 +3007,27 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
53266 for (iter = next_tgid(ns, iter);
53267 iter.task;
53268 iter.tgid += 1, iter = next_tgid(ns, iter)) {
53269+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53270+ rcu_read_lock();
53271+ itercred = __task_cred(iter.task);
53272+#endif
53273+ if (gr_pid_is_chrooted(iter.task) || gr_check_hidden_task(iter.task)
53274+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53275+ || (tmpcred->uid && (itercred->uid != tmpcred->uid)
53276+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
53277+ && !in_group_p(CONFIG_GRKERNSEC_PROC_GID)
53278+#endif
53279+ )
53280+#endif
53281+ )
53282+ __filldir = &gr_fake_filldir;
53283+ else
53284+ __filldir = filldir;
53285+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53286+ rcu_read_unlock();
53287+#endif
53288 filp->f_pos = iter.tgid + TGID_OFFSET;
53289- if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
53290+ if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
53291 put_task_struct(iter.task);
53292 goto out;
53293 }
53294@@ -2892,7 +3053,7 @@ static const struct pid_entry tid_base_stuff[] = {
53295 #ifdef CONFIG_SCHED_DEBUG
53296 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
53297 #endif
53298-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
53299+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
53300 INF("syscall", S_IRUGO, proc_pid_syscall),
53301 #endif
53302 INF("cmdline", S_IRUGO, proc_pid_cmdline),
53303@@ -2916,10 +3077,10 @@ static const struct pid_entry tid_base_stuff[] = {
53304 #ifdef CONFIG_SECURITY
53305 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
53306 #endif
53307-#ifdef CONFIG_KALLSYMS
53308+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
53309 INF("wchan", S_IRUGO, proc_pid_wchan),
53310 #endif
53311-#ifdef CONFIG_STACKTRACE
53312+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
53313 ONE("stack", S_IRUGO, proc_pid_stack),
53314 #endif
53315 #ifdef CONFIG_SCHEDSTATS
53316diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
53317index 82676e3..5f8518a 100644
53318--- a/fs/proc/cmdline.c
53319+++ b/fs/proc/cmdline.c
53320@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
53321
53322 static int __init proc_cmdline_init(void)
53323 {
53324+#ifdef CONFIG_GRKERNSEC_PROC_ADD
53325+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
53326+#else
53327 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
53328+#endif
53329 return 0;
53330 }
53331 module_init(proc_cmdline_init);
53332diff --git a/fs/proc/devices.c b/fs/proc/devices.c
53333index 59ee7da..469b4b6 100644
53334--- a/fs/proc/devices.c
53335+++ b/fs/proc/devices.c
53336@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
53337
53338 static int __init proc_devices_init(void)
53339 {
53340+#ifdef CONFIG_GRKERNSEC_PROC_ADD
53341+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
53342+#else
53343 proc_create("devices", 0, NULL, &proc_devinfo_operations);
53344+#endif
53345 return 0;
53346 }
53347 module_init(proc_devices_init);
53348diff --git a/fs/proc/inode.c b/fs/proc/inode.c
53349index d78ade3..81767f9 100644
53350--- a/fs/proc/inode.c
53351+++ b/fs/proc/inode.c
53352@@ -18,12 +18,19 @@
53353 #include <linux/module.h>
53354 #include <linux/smp_lock.h>
53355 #include <linux/sysctl.h>
53356+#include <linux/grsecurity.h>
53357
53358 #include <asm/system.h>
53359 #include <asm/uaccess.h>
53360
53361 #include "internal.h"
53362
53363+#ifdef CONFIG_PROC_SYSCTL
53364+extern const struct inode_operations proc_sys_inode_operations;
53365+extern const struct inode_operations proc_sys_dir_operations;
53366+#endif
53367+
53368+
53369 struct proc_dir_entry *de_get(struct proc_dir_entry *de)
53370 {
53371 atomic_inc(&de->count);
53372@@ -62,6 +69,13 @@ static void proc_delete_inode(struct inode *inode)
53373 de_put(de);
53374 if (PROC_I(inode)->sysctl)
53375 sysctl_head_put(PROC_I(inode)->sysctl);
53376+
53377+#ifdef CONFIG_PROC_SYSCTL
53378+ if (inode->i_op == &proc_sys_inode_operations ||
53379+ inode->i_op == &proc_sys_dir_operations)
53380+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
53381+#endif
53382+
53383 clear_inode(inode);
53384 }
53385
53386@@ -457,7 +471,11 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino,
53387 if (de->mode) {
53388 inode->i_mode = de->mode;
53389 inode->i_uid = de->uid;
53390+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
53391+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
53392+#else
53393 inode->i_gid = de->gid;
53394+#endif
53395 }
53396 if (de->size)
53397 inode->i_size = de->size;
53398diff --git a/fs/proc/internal.h b/fs/proc/internal.h
53399index 753ca37..26bcf3b 100644
53400--- a/fs/proc/internal.h
53401+++ b/fs/proc/internal.h
53402@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
53403 struct pid *pid, struct task_struct *task);
53404 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
53405 struct pid *pid, struct task_struct *task);
53406+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
53407+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
53408+#endif
53409 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
53410
53411 extern const struct file_operations proc_maps_operations;
53412diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
53413index b442dac..aab29cb 100644
53414--- a/fs/proc/kcore.c
53415+++ b/fs/proc/kcore.c
53416@@ -320,6 +320,8 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff)
53417 off_t offset = 0;
53418 struct kcore_list *m;
53419
53420+ pax_track_stack();
53421+
53422 /* setup ELF header */
53423 elf = (struct elfhdr *) bufp;
53424 bufp += sizeof(struct elfhdr);
53425@@ -477,9 +479,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
53426 * the addresses in the elf_phdr on our list.
53427 */
53428 start = kc_offset_to_vaddr(*fpos - elf_buflen);
53429- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
53430+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
53431+ if (tsz > buflen)
53432 tsz = buflen;
53433-
53434+
53435 while (buflen) {
53436 struct kcore_list *m;
53437
53438@@ -508,20 +511,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
53439 kfree(elf_buf);
53440 } else {
53441 if (kern_addr_valid(start)) {
53442- unsigned long n;
53443+ char *elf_buf;
53444+ mm_segment_t oldfs;
53445
53446- n = copy_to_user(buffer, (char *)start, tsz);
53447- /*
53448- * We cannot distingush between fault on source
53449- * and fault on destination. When this happens
53450- * we clear too and hope it will trigger the
53451- * EFAULT again.
53452- */
53453- if (n) {
53454- if (clear_user(buffer + tsz - n,
53455- n))
53456+ elf_buf = kmalloc(tsz, GFP_KERNEL);
53457+ if (!elf_buf)
53458+ return -ENOMEM;
53459+ oldfs = get_fs();
53460+ set_fs(KERNEL_DS);
53461+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
53462+ set_fs(oldfs);
53463+ if (copy_to_user(buffer, elf_buf, tsz)) {
53464+ kfree(elf_buf);
53465 return -EFAULT;
53466+ }
53467 }
53468+ set_fs(oldfs);
53469+ kfree(elf_buf);
53470 } else {
53471 if (clear_user(buffer, tsz))
53472 return -EFAULT;
53473@@ -541,6 +547,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
53474
53475 static int open_kcore(struct inode *inode, struct file *filp)
53476 {
53477+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
53478+ return -EPERM;
53479+#endif
53480 if (!capable(CAP_SYS_RAWIO))
53481 return -EPERM;
53482 if (kcore_need_update)
53483diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c
53484index 7ca7834..cfe90a4 100644
53485--- a/fs/proc/kmsg.c
53486+++ b/fs/proc/kmsg.c
53487@@ -12,37 +12,37 @@
53488 #include <linux/poll.h>
53489 #include <linux/proc_fs.h>
53490 #include <linux/fs.h>
53491+#include <linux/syslog.h>
53492
53493 #include <asm/uaccess.h>
53494 #include <asm/io.h>
53495
53496 extern wait_queue_head_t log_wait;
53497
53498-extern int do_syslog(int type, char __user *bug, int count);
53499-
53500 static int kmsg_open(struct inode * inode, struct file * file)
53501 {
53502- return do_syslog(1,NULL,0);
53503+ return do_syslog(SYSLOG_ACTION_OPEN, NULL, 0, SYSLOG_FROM_FILE);
53504 }
53505
53506 static int kmsg_release(struct inode * inode, struct file * file)
53507 {
53508- (void) do_syslog(0,NULL,0);
53509+ (void) do_syslog(SYSLOG_ACTION_CLOSE, NULL, 0, SYSLOG_FROM_FILE);
53510 return 0;
53511 }
53512
53513 static ssize_t kmsg_read(struct file *file, char __user *buf,
53514 size_t count, loff_t *ppos)
53515 {
53516- if ((file->f_flags & O_NONBLOCK) && !do_syslog(9, NULL, 0))
53517+ if ((file->f_flags & O_NONBLOCK) &&
53518+ !do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_FILE))
53519 return -EAGAIN;
53520- return do_syslog(2, buf, count);
53521+ return do_syslog(SYSLOG_ACTION_READ, buf, count, SYSLOG_FROM_FILE);
53522 }
53523
53524 static unsigned int kmsg_poll(struct file *file, poll_table *wait)
53525 {
53526 poll_wait(file, &log_wait, wait);
53527- if (do_syslog(9, NULL, 0))
53528+ if (do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_FILE))
53529 return POLLIN | POLLRDNORM;
53530 return 0;
53531 }
53532diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
53533index a65239c..ad1182a 100644
53534--- a/fs/proc/meminfo.c
53535+++ b/fs/proc/meminfo.c
53536@@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
53537 unsigned long pages[NR_LRU_LISTS];
53538 int lru;
53539
53540+ pax_track_stack();
53541+
53542 /*
53543 * display in kilobytes.
53544 */
53545@@ -149,7 +151,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
53546 vmi.used >> 10,
53547 vmi.largest_chunk >> 10
53548 #ifdef CONFIG_MEMORY_FAILURE
53549- ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
53550+ ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
53551 #endif
53552 );
53553
53554diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
53555index 9fe7d7e..cdb62c9 100644
53556--- a/fs/proc/nommu.c
53557+++ b/fs/proc/nommu.c
53558@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
53559 if (len < 1)
53560 len = 1;
53561 seq_printf(m, "%*c", len, ' ');
53562- seq_path(m, &file->f_path, "");
53563+ seq_path(m, &file->f_path, "\n\\");
53564 }
53565
53566 seq_putc(m, '\n');
53567diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
53568index 04d1270..25e1173 100644
53569--- a/fs/proc/proc_net.c
53570+++ b/fs/proc/proc_net.c
53571@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(struct inode *dir)
53572 struct task_struct *task;
53573 struct nsproxy *ns;
53574 struct net *net = NULL;
53575+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53576+ const struct cred *cred = current_cred();
53577+#endif
53578+
53579+#ifdef CONFIG_GRKERNSEC_PROC_USER
53580+ if (cred->fsuid)
53581+ return net;
53582+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53583+ if (cred->fsuid && !in_group_p(CONFIG_GRKERNSEC_PROC_GID))
53584+ return net;
53585+#endif
53586
53587 rcu_read_lock();
53588 task = pid_task(proc_pid(dir), PIDTYPE_PID);
53589diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
53590index f667e8a..55f4d96 100644
53591--- a/fs/proc/proc_sysctl.c
53592+++ b/fs/proc/proc_sysctl.c
53593@@ -7,11 +7,13 @@
53594 #include <linux/security.h>
53595 #include "internal.h"
53596
53597+extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op);
53598+
53599 static const struct dentry_operations proc_sys_dentry_operations;
53600 static const struct file_operations proc_sys_file_operations;
53601-static const struct inode_operations proc_sys_inode_operations;
53602+const struct inode_operations proc_sys_inode_operations;
53603 static const struct file_operations proc_sys_dir_file_operations;
53604-static const struct inode_operations proc_sys_dir_operations;
53605+const struct inode_operations proc_sys_dir_operations;
53606
53607 static struct inode *proc_sys_make_inode(struct super_block *sb,
53608 struct ctl_table_header *head, struct ctl_table *table)
53609@@ -109,6 +111,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
53610 if (!p)
53611 goto out;
53612
53613+ if (gr_handle_sysctl(p, MAY_EXEC))
53614+ goto out;
53615+
53616 err = ERR_PTR(-ENOMEM);
53617 inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
53618 if (h)
53619@@ -119,6 +124,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
53620
53621 err = NULL;
53622 dentry->d_op = &proc_sys_dentry_operations;
53623+
53624+ gr_handle_proc_create(dentry, inode);
53625+
53626 d_add(dentry, inode);
53627
53628 out:
53629@@ -200,6 +208,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
53630 return -ENOMEM;
53631 } else {
53632 child->d_op = &proc_sys_dentry_operations;
53633+
53634+ gr_handle_proc_create(child, inode);
53635+
53636 d_add(child, inode);
53637 }
53638 } else {
53639@@ -228,6 +239,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
53640 if (*pos < file->f_pos)
53641 continue;
53642
53643+ if (gr_handle_sysctl(table, 0))
53644+ continue;
53645+
53646 res = proc_sys_fill_cache(file, dirent, filldir, head, table);
53647 if (res)
53648 return res;
53649@@ -344,6 +358,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
53650 if (IS_ERR(head))
53651 return PTR_ERR(head);
53652
53653+ if (table && gr_handle_sysctl(table, MAY_EXEC))
53654+ return -ENOENT;
53655+
53656 generic_fillattr(inode, stat);
53657 if (table)
53658 stat->mode = (stat->mode & S_IFMT) | table->mode;
53659@@ -358,17 +375,18 @@ static const struct file_operations proc_sys_file_operations = {
53660 };
53661
53662 static const struct file_operations proc_sys_dir_file_operations = {
53663+ .read = generic_read_dir,
53664 .readdir = proc_sys_readdir,
53665 .llseek = generic_file_llseek,
53666 };
53667
53668-static const struct inode_operations proc_sys_inode_operations = {
53669+const struct inode_operations proc_sys_inode_operations = {
53670 .permission = proc_sys_permission,
53671 .setattr = proc_sys_setattr,
53672 .getattr = proc_sys_getattr,
53673 };
53674
53675-static const struct inode_operations proc_sys_dir_operations = {
53676+const struct inode_operations proc_sys_dir_operations = {
53677 .lookup = proc_sys_lookup,
53678 .permission = proc_sys_permission,
53679 .setattr = proc_sys_setattr,
53680diff --git a/fs/proc/root.c b/fs/proc/root.c
53681index b080b79..d957e63 100644
53682--- a/fs/proc/root.c
53683+++ b/fs/proc/root.c
53684@@ -134,7 +134,15 @@ void __init proc_root_init(void)
53685 #ifdef CONFIG_PROC_DEVICETREE
53686 proc_device_tree_init();
53687 #endif
53688+#ifdef CONFIG_GRKERNSEC_PROC_ADD
53689+#ifdef CONFIG_GRKERNSEC_PROC_USER
53690+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
53691+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53692+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
53693+#endif
53694+#else
53695 proc_mkdir("bus", NULL);
53696+#endif
53697 proc_sys_init();
53698 }
53699
53700diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
53701index 3b7b82a..4b420b0 100644
53702--- a/fs/proc/task_mmu.c
53703+++ b/fs/proc/task_mmu.c
53704@@ -8,6 +8,7 @@
53705 #include <linux/mempolicy.h>
53706 #include <linux/swap.h>
53707 #include <linux/swapops.h>
53708+#include <linux/grsecurity.h>
53709
53710 #include <asm/elf.h>
53711 #include <asm/uaccess.h>
53712@@ -46,15 +47,26 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
53713 "VmStk:\t%8lu kB\n"
53714 "VmExe:\t%8lu kB\n"
53715 "VmLib:\t%8lu kB\n"
53716- "VmPTE:\t%8lu kB\n",
53717- hiwater_vm << (PAGE_SHIFT-10),
53718+ "VmPTE:\t%8lu kB\n"
53719+
53720+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
53721+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
53722+#endif
53723+
53724+ ,hiwater_vm << (PAGE_SHIFT-10),
53725 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
53726 mm->locked_vm << (PAGE_SHIFT-10),
53727 hiwater_rss << (PAGE_SHIFT-10),
53728 total_rss << (PAGE_SHIFT-10),
53729 data << (PAGE_SHIFT-10),
53730 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
53731- (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10);
53732+ (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10
53733+
53734+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
53735+ , mm->context.user_cs_base, mm->context.user_cs_limit
53736+#endif
53737+
53738+ );
53739 }
53740
53741 unsigned long task_vsize(struct mm_struct *mm)
53742@@ -175,7 +187,8 @@ static void m_stop(struct seq_file *m, void *v)
53743 struct proc_maps_private *priv = m->private;
53744 struct vm_area_struct *vma = v;
53745
53746- vma_stop(priv, vma);
53747+ if (!IS_ERR(vma))
53748+ vma_stop(priv, vma);
53749 if (priv->task)
53750 put_task_struct(priv->task);
53751 }
53752@@ -199,6 +212,12 @@ static int do_maps_open(struct inode *inode, struct file *file,
53753 return ret;
53754 }
53755
53756+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53757+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
53758+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
53759+ _mm->pax_flags & MF_PAX_SEGMEXEC))
53760+#endif
53761+
53762 static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
53763 {
53764 struct mm_struct *mm = vma->vm_mm;
53765@@ -206,7 +225,6 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
53766 int flags = vma->vm_flags;
53767 unsigned long ino = 0;
53768 unsigned long long pgoff = 0;
53769- unsigned long start;
53770 dev_t dev = 0;
53771 int len;
53772
53773@@ -217,20 +235,23 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
53774 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
53775 }
53776
53777- /* We don't show the stack guard page in /proc/maps */
53778- start = vma->vm_start;
53779- if (vma->vm_flags & VM_GROWSDOWN)
53780- if (!vma_stack_continue(vma->vm_prev, vma->vm_start))
53781- start += PAGE_SIZE;
53782-
53783 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
53784- start,
53785+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53786+ PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start,
53787+ PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end,
53788+#else
53789+ vma->vm_start,
53790 vma->vm_end,
53791+#endif
53792 flags & VM_READ ? 'r' : '-',
53793 flags & VM_WRITE ? 'w' : '-',
53794 flags & VM_EXEC ? 'x' : '-',
53795 flags & VM_MAYSHARE ? 's' : 'p',
53796+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53797+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
53798+#else
53799 pgoff,
53800+#endif
53801 MAJOR(dev), MINOR(dev), ino, &len);
53802
53803 /*
53804@@ -239,7 +260,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
53805 */
53806 if (file) {
53807 pad_len_spaces(m, len);
53808- seq_path(m, &file->f_path, "\n");
53809+ seq_path(m, &file->f_path, "\n\\");
53810 } else {
53811 const char *name = arch_vma_name(vma);
53812 if (!name) {
53813@@ -247,8 +268,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
53814 if (vma->vm_start <= mm->brk &&
53815 vma->vm_end >= mm->start_brk) {
53816 name = "[heap]";
53817- } else if (vma->vm_start <= mm->start_stack &&
53818- vma->vm_end >= mm->start_stack) {
53819+ } else if ((vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
53820+ (vma->vm_start <= mm->start_stack &&
53821+ vma->vm_end >= mm->start_stack)) {
53822 name = "[stack]";
53823 }
53824 } else {
53825@@ -269,6 +291,13 @@ static int show_map(struct seq_file *m, void *v)
53826 struct proc_maps_private *priv = m->private;
53827 struct task_struct *task = priv->task;
53828
53829+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53830+ if (current->exec_id != m->exec_id) {
53831+ gr_log_badprocpid("maps");
53832+ return 0;
53833+ }
53834+#endif
53835+
53836 show_map_vma(m, vma);
53837
53838 if (m->count < m->size) /* vma is copied successfully */
53839@@ -390,10 +419,23 @@ static int show_smap(struct seq_file *m, void *v)
53840 .private = &mss,
53841 };
53842
53843+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53844+ if (current->exec_id != m->exec_id) {
53845+ gr_log_badprocpid("smaps");
53846+ return 0;
53847+ }
53848+#endif
53849 memset(&mss, 0, sizeof mss);
53850- mss.vma = vma;
53851- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
53852- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
53853+
53854+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53855+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
53856+#endif
53857+ mss.vma = vma;
53858+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
53859+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
53860+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53861+ }
53862+#endif
53863
53864 show_map_vma(m, vma);
53865
53866@@ -409,7 +451,11 @@ static int show_smap(struct seq_file *m, void *v)
53867 "Swap: %8lu kB\n"
53868 "KernelPageSize: %8lu kB\n"
53869 "MMUPageSize: %8lu kB\n",
53870+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53871+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
53872+#else
53873 (vma->vm_end - vma->vm_start) >> 10,
53874+#endif
53875 mss.resident >> 10,
53876 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
53877 mss.shared_clean >> 10,
53878diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
53879index 8f5c05d..c99c76d 100644
53880--- a/fs/proc/task_nommu.c
53881+++ b/fs/proc/task_nommu.c
53882@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
53883 else
53884 bytes += kobjsize(mm);
53885
53886- if (current->fs && current->fs->users > 1)
53887+ if (current->fs && atomic_read(&current->fs->users) > 1)
53888 sbytes += kobjsize(current->fs);
53889 else
53890 bytes += kobjsize(current->fs);
53891@@ -154,7 +154,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
53892 if (len < 1)
53893 len = 1;
53894 seq_printf(m, "%*c", len, ' ');
53895- seq_path(m, &file->f_path, "");
53896+ seq_path(m, &file->f_path, "\n\\");
53897 }
53898
53899 seq_putc(m, '\n');
53900diff --git a/fs/readdir.c b/fs/readdir.c
53901index 7723401..30059a6 100644
53902--- a/fs/readdir.c
53903+++ b/fs/readdir.c
53904@@ -16,6 +16,7 @@
53905 #include <linux/security.h>
53906 #include <linux/syscalls.h>
53907 #include <linux/unistd.h>
53908+#include <linux/namei.h>
53909
53910 #include <asm/uaccess.h>
53911
53912@@ -67,6 +68,7 @@ struct old_linux_dirent {
53913
53914 struct readdir_callback {
53915 struct old_linux_dirent __user * dirent;
53916+ struct file * file;
53917 int result;
53918 };
53919
53920@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
53921 buf->result = -EOVERFLOW;
53922 return -EOVERFLOW;
53923 }
53924+
53925+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
53926+ return 0;
53927+
53928 buf->result++;
53929 dirent = buf->dirent;
53930 if (!access_ok(VERIFY_WRITE, dirent,
53931@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
53932
53933 buf.result = 0;
53934 buf.dirent = dirent;
53935+ buf.file = file;
53936
53937 error = vfs_readdir(file, fillonedir, &buf);
53938 if (buf.result)
53939@@ -142,6 +149,7 @@ struct linux_dirent {
53940 struct getdents_callback {
53941 struct linux_dirent __user * current_dir;
53942 struct linux_dirent __user * previous;
53943+ struct file * file;
53944 int count;
53945 int error;
53946 };
53947@@ -162,6 +170,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
53948 buf->error = -EOVERFLOW;
53949 return -EOVERFLOW;
53950 }
53951+
53952+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
53953+ return 0;
53954+
53955 dirent = buf->previous;
53956 if (dirent) {
53957 if (__put_user(offset, &dirent->d_off))
53958@@ -209,6 +221,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
53959 buf.previous = NULL;
53960 buf.count = count;
53961 buf.error = 0;
53962+ buf.file = file;
53963
53964 error = vfs_readdir(file, filldir, &buf);
53965 if (error >= 0)
53966@@ -228,6 +241,7 @@ out:
53967 struct getdents_callback64 {
53968 struct linux_dirent64 __user * current_dir;
53969 struct linux_dirent64 __user * previous;
53970+ struct file *file;
53971 int count;
53972 int error;
53973 };
53974@@ -242,6 +256,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
53975 buf->error = -EINVAL; /* only used if we fail.. */
53976 if (reclen > buf->count)
53977 return -EINVAL;
53978+
53979+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
53980+ return 0;
53981+
53982 dirent = buf->previous;
53983 if (dirent) {
53984 if (__put_user(offset, &dirent->d_off))
53985@@ -289,6 +307,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
53986
53987 buf.current_dir = dirent;
53988 buf.previous = NULL;
53989+ buf.file = file;
53990 buf.count = count;
53991 buf.error = 0;
53992
53993@@ -297,7 +316,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
53994 error = buf.error;
53995 lastdirent = buf.previous;
53996 if (lastdirent) {
53997- typeof(lastdirent->d_off) d_off = file->f_pos;
53998+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
53999 if (__put_user(d_off, &lastdirent->d_off))
54000 error = -EFAULT;
54001 else
54002diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
54003index d42c30c..4fd8718 100644
54004--- a/fs/reiserfs/dir.c
54005+++ b/fs/reiserfs/dir.c
54006@@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent,
54007 struct reiserfs_dir_entry de;
54008 int ret = 0;
54009
54010+ pax_track_stack();
54011+
54012 reiserfs_write_lock(inode->i_sb);
54013
54014 reiserfs_check_lock_depth(inode->i_sb, "readdir");
54015diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
54016index 128d3f7..8840d44 100644
54017--- a/fs/reiserfs/do_balan.c
54018+++ b/fs/reiserfs/do_balan.c
54019@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
54020 return;
54021 }
54022
54023- atomic_inc(&(fs_generation(tb->tb_sb)));
54024+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
54025 do_balance_starts(tb);
54026
54027 /* balance leaf returns 0 except if combining L R and S into
54028diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
54029index 72cb1cc..d0e3181 100644
54030--- a/fs/reiserfs/item_ops.c
54031+++ b/fs/reiserfs/item_ops.c
54032@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_item *vi)
54033 vi->vi_index, vi->vi_type, vi->vi_ih);
54034 }
54035
54036-static struct item_operations stat_data_ops = {
54037+static const struct item_operations stat_data_ops = {
54038 .bytes_number = sd_bytes_number,
54039 .decrement_key = sd_decrement_key,
54040 .is_left_mergeable = sd_is_left_mergeable,
54041@@ -196,7 +196,7 @@ static void direct_print_vi(struct virtual_item *vi)
54042 vi->vi_index, vi->vi_type, vi->vi_ih);
54043 }
54044
54045-static struct item_operations direct_ops = {
54046+static const struct item_operations direct_ops = {
54047 .bytes_number = direct_bytes_number,
54048 .decrement_key = direct_decrement_key,
54049 .is_left_mergeable = direct_is_left_mergeable,
54050@@ -341,7 +341,7 @@ static void indirect_print_vi(struct virtual_item *vi)
54051 vi->vi_index, vi->vi_type, vi->vi_ih);
54052 }
54053
54054-static struct item_operations indirect_ops = {
54055+static const struct item_operations indirect_ops = {
54056 .bytes_number = indirect_bytes_number,
54057 .decrement_key = indirect_decrement_key,
54058 .is_left_mergeable = indirect_is_left_mergeable,
54059@@ -628,7 +628,7 @@ static void direntry_print_vi(struct virtual_item *vi)
54060 printk("\n");
54061 }
54062
54063-static struct item_operations direntry_ops = {
54064+static const struct item_operations direntry_ops = {
54065 .bytes_number = direntry_bytes_number,
54066 .decrement_key = direntry_decrement_key,
54067 .is_left_mergeable = direntry_is_left_mergeable,
54068@@ -724,7 +724,7 @@ static void errcatch_print_vi(struct virtual_item *vi)
54069 "Invalid item type observed, run fsck ASAP");
54070 }
54071
54072-static struct item_operations errcatch_ops = {
54073+static const struct item_operations errcatch_ops = {
54074 errcatch_bytes_number,
54075 errcatch_decrement_key,
54076 errcatch_is_left_mergeable,
54077@@ -746,7 +746,7 @@ static struct item_operations errcatch_ops = {
54078 #error Item types must use disk-format assigned values.
54079 #endif
54080
54081-struct item_operations *item_ops[TYPE_ANY + 1] = {
54082+const struct item_operations * const item_ops[TYPE_ANY + 1] = {
54083 &stat_data_ops,
54084 &indirect_ops,
54085 &direct_ops,
54086diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
54087index b5fe0aa..e0e25c4 100644
54088--- a/fs/reiserfs/journal.c
54089+++ b/fs/reiserfs/journal.c
54090@@ -2329,6 +2329,8 @@ static struct buffer_head *reiserfs_breada(struct block_device *dev,
54091 struct buffer_head *bh;
54092 int i, j;
54093
54094+ pax_track_stack();
54095+
54096 bh = __getblk(dev, block, bufsize);
54097 if (buffer_uptodate(bh))
54098 return (bh);
54099diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
54100index 2715791..b8996db 100644
54101--- a/fs/reiserfs/namei.c
54102+++ b/fs/reiserfs/namei.c
54103@@ -1214,6 +1214,8 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
54104 unsigned long savelink = 1;
54105 struct timespec ctime;
54106
54107+ pax_track_stack();
54108+
54109 /* three balancings: (1) old name removal, (2) new name insertion
54110 and (3) maybe "save" link insertion
54111 stat data updates: (1) old directory,
54112diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
54113index 9229e55..3d2e3b7 100644
54114--- a/fs/reiserfs/procfs.c
54115+++ b/fs/reiserfs/procfs.c
54116@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
54117 "SMALL_TAILS " : "NO_TAILS ",
54118 replay_only(sb) ? "REPLAY_ONLY " : "",
54119 convert_reiserfs(sb) ? "CONV " : "",
54120- atomic_read(&r->s_generation_counter),
54121+ atomic_read_unchecked(&r->s_generation_counter),
54122 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
54123 SF(s_do_balance), SF(s_unneeded_left_neighbor),
54124 SF(s_good_search_by_key_reada), SF(s_bmaps),
54125@@ -309,6 +309,8 @@ static int show_journal(struct seq_file *m, struct super_block *sb)
54126 struct journal_params *jp = &rs->s_v1.s_journal;
54127 char b[BDEVNAME_SIZE];
54128
54129+ pax_track_stack();
54130+
54131 seq_printf(m, /* on-disk fields */
54132 "jp_journal_1st_block: \t%i\n"
54133 "jp_journal_dev: \t%s[%x]\n"
54134diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
54135index d036ee5..4c7dca1 100644
54136--- a/fs/reiserfs/stree.c
54137+++ b/fs/reiserfs/stree.c
54138@@ -1159,6 +1159,8 @@ int reiserfs_delete_item(struct reiserfs_transaction_handle *th,
54139 int iter = 0;
54140 #endif
54141
54142+ pax_track_stack();
54143+
54144 BUG_ON(!th->t_trans_id);
54145
54146 init_tb_struct(th, &s_del_balance, sb, path,
54147@@ -1296,6 +1298,8 @@ void reiserfs_delete_solid_item(struct reiserfs_transaction_handle *th,
54148 int retval;
54149 int quota_cut_bytes = 0;
54150
54151+ pax_track_stack();
54152+
54153 BUG_ON(!th->t_trans_id);
54154
54155 le_key2cpu_key(&cpu_key, key);
54156@@ -1525,6 +1529,8 @@ int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th,
54157 int quota_cut_bytes;
54158 loff_t tail_pos = 0;
54159
54160+ pax_track_stack();
54161+
54162 BUG_ON(!th->t_trans_id);
54163
54164 init_tb_struct(th, &s_cut_balance, inode->i_sb, path,
54165@@ -1920,6 +1926,8 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct tree
54166 int retval;
54167 int fs_gen;
54168
54169+ pax_track_stack();
54170+
54171 BUG_ON(!th->t_trans_id);
54172
54173 fs_gen = get_generation(inode->i_sb);
54174@@ -2007,6 +2015,8 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
54175 int fs_gen = 0;
54176 int quota_bytes = 0;
54177
54178+ pax_track_stack();
54179+
54180 BUG_ON(!th->t_trans_id);
54181
54182 if (inode) { /* Do we count quotas for item? */
54183diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
54184index 7cb1285..c726cd0 100644
54185--- a/fs/reiserfs/super.c
54186+++ b/fs/reiserfs/super.c
54187@@ -916,6 +916,8 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin
54188 {.option_name = NULL}
54189 };
54190
54191+ pax_track_stack();
54192+
54193 *blocks = 0;
54194 if (!options || !*options)
54195 /* use default configuration: create tails, journaling on, no
54196diff --git a/fs/select.c b/fs/select.c
54197index fd38ce2..f5381b8 100644
54198--- a/fs/select.c
54199+++ b/fs/select.c
54200@@ -20,6 +20,7 @@
54201 #include <linux/module.h>
54202 #include <linux/slab.h>
54203 #include <linux/poll.h>
54204+#include <linux/security.h>
54205 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
54206 #include <linux/file.h>
54207 #include <linux/fdtable.h>
54208@@ -401,6 +402,8 @@ int do_select(int n, fd_set_bits *fds, struct timespec *end_time)
54209 int retval, i, timed_out = 0;
54210 unsigned long slack = 0;
54211
54212+ pax_track_stack();
54213+
54214 rcu_read_lock();
54215 retval = max_select_fd(n, fds);
54216 rcu_read_unlock();
54217@@ -529,6 +532,8 @@ int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
54218 /* Allocate small arguments on the stack to save memory and be faster */
54219 long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
54220
54221+ pax_track_stack();
54222+
54223 ret = -EINVAL;
54224 if (n < 0)
54225 goto out_nofds;
54226@@ -821,6 +826,9 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
54227 struct poll_list *walk = head;
54228 unsigned long todo = nfds;
54229
54230+ pax_track_stack();
54231+
54232+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
54233 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
54234 return -EINVAL;
54235
54236diff --git a/fs/seq_file.c b/fs/seq_file.c
54237index eae7d9d..12c71e3 100644
54238--- a/fs/seq_file.c
54239+++ b/fs/seq_file.c
54240@@ -40,6 +40,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
54241 memset(p, 0, sizeof(*p));
54242 mutex_init(&p->lock);
54243 p->op = op;
54244+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
54245+ p->exec_id = current->exec_id;
54246+#endif
54247
54248 /*
54249 * Wrappers around seq_open(e.g. swaps_open) need to be
54250@@ -76,7 +79,8 @@ static int traverse(struct seq_file *m, loff_t offset)
54251 return 0;
54252 }
54253 if (!m->buf) {
54254- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
54255+ m->size = PAGE_SIZE;
54256+ m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
54257 if (!m->buf)
54258 return -ENOMEM;
54259 }
54260@@ -116,7 +120,8 @@ static int traverse(struct seq_file *m, loff_t offset)
54261 Eoverflow:
54262 m->op->stop(m, p);
54263 kfree(m->buf);
54264- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
54265+ m->size <<= 1;
54266+ m->buf = kmalloc(m->size, GFP_KERNEL);
54267 return !m->buf ? -ENOMEM : -EAGAIN;
54268 }
54269
54270@@ -169,7 +174,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
54271 m->version = file->f_version;
54272 /* grab buffer if we didn't have one */
54273 if (!m->buf) {
54274- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
54275+ m->size = PAGE_SIZE;
54276+ m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
54277 if (!m->buf)
54278 goto Enomem;
54279 }
54280@@ -210,7 +216,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
54281 goto Fill;
54282 m->op->stop(m, p);
54283 kfree(m->buf);
54284- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
54285+ m->size <<= 1;
54286+ m->buf = kmalloc(m->size, GFP_KERNEL);
54287 if (!m->buf)
54288 goto Enomem;
54289 m->count = 0;
54290@@ -551,7 +558,7 @@ static void single_stop(struct seq_file *p, void *v)
54291 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
54292 void *data)
54293 {
54294- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
54295+ seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
54296 int res = -ENOMEM;
54297
54298 if (op) {
54299diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
54300index 71c29b6..54694dd 100644
54301--- a/fs/smbfs/proc.c
54302+++ b/fs/smbfs/proc.c
54303@@ -266,9 +266,9 @@ int smb_setcodepage(struct smb_sb_info *server, struct smb_nls_codepage *cp)
54304
54305 out:
54306 if (server->local_nls != NULL && server->remote_nls != NULL)
54307- server->ops->convert = convert_cp;
54308+ *(void **)&server->ops->convert = convert_cp;
54309 else
54310- server->ops->convert = convert_memcpy;
54311+ *(void **)&server->ops->convert = convert_memcpy;
54312
54313 smb_unlock_server(server);
54314 return n;
54315@@ -933,9 +933,9 @@ smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
54316
54317 /* FIXME: the win9x code wants to modify these ... (seek/trunc bug) */
54318 if (server->mnt->flags & SMB_MOUNT_OLDATTR) {
54319- server->ops->getattr = smb_proc_getattr_core;
54320+ *(void **)&server->ops->getattr = smb_proc_getattr_core;
54321 } else if (server->mnt->flags & SMB_MOUNT_DIRATTR) {
54322- server->ops->getattr = smb_proc_getattr_ff;
54323+ *(void **)&server->ops->getattr = smb_proc_getattr_ff;
54324 }
54325
54326 /* Decode server capabilities */
54327@@ -3439,7 +3439,7 @@ out:
54328 static void
54329 install_ops(struct smb_ops *dst, struct smb_ops *src)
54330 {
54331- memcpy(dst, src, sizeof(void *) * SMB_OPS_NUM_STATIC);
54332+ memcpy((void *)dst, src, sizeof(void *) * SMB_OPS_NUM_STATIC);
54333 }
54334
54335 /* < LANMAN2 */
54336diff --git a/fs/smbfs/symlink.c b/fs/smbfs/symlink.c
54337index 00b2909..2ace383 100644
54338--- a/fs/smbfs/symlink.c
54339+++ b/fs/smbfs/symlink.c
54340@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dentry *dentry, struct nameidata *nd)
54341
54342 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
54343 {
54344- char *s = nd_get_link(nd);
54345+ const char *s = nd_get_link(nd);
54346 if (!IS_ERR(s))
54347 __putname(s);
54348 }
54349diff --git a/fs/splice.c b/fs/splice.c
54350index bb92b7c..5aa72b0 100644
54351--- a/fs/splice.c
54352+++ b/fs/splice.c
54353@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
54354 pipe_lock(pipe);
54355
54356 for (;;) {
54357- if (!pipe->readers) {
54358+ if (!atomic_read(&pipe->readers)) {
54359 send_sig(SIGPIPE, current, 0);
54360 if (!ret)
54361 ret = -EPIPE;
54362@@ -239,9 +239,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
54363 do_wakeup = 0;
54364 }
54365
54366- pipe->waiting_writers++;
54367+ atomic_inc(&pipe->waiting_writers);
54368 pipe_wait(pipe);
54369- pipe->waiting_writers--;
54370+ atomic_dec(&pipe->waiting_writers);
54371 }
54372
54373 pipe_unlock(pipe);
54374@@ -285,6 +285,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
54375 .spd_release = spd_release_page,
54376 };
54377
54378+ pax_track_stack();
54379+
54380 index = *ppos >> PAGE_CACHE_SHIFT;
54381 loff = *ppos & ~PAGE_CACHE_MASK;
54382 req_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
54383@@ -521,7 +523,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
54384 old_fs = get_fs();
54385 set_fs(get_ds());
54386 /* The cast to a user pointer is valid due to the set_fs() */
54387- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
54388+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
54389 set_fs(old_fs);
54390
54391 return res;
54392@@ -536,7 +538,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
54393 old_fs = get_fs();
54394 set_fs(get_ds());
54395 /* The cast to a user pointer is valid due to the set_fs() */
54396- res = vfs_write(file, (const char __user *)buf, count, &pos);
54397+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
54398 set_fs(old_fs);
54399
54400 return res;
54401@@ -565,6 +567,8 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
54402 .spd_release = spd_release_page,
54403 };
54404
54405+ pax_track_stack();
54406+
54407 index = *ppos >> PAGE_CACHE_SHIFT;
54408 offset = *ppos & ~PAGE_CACHE_MASK;
54409 nr_pages = (len + offset + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
54410@@ -578,7 +582,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
54411 goto err;
54412
54413 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
54414- vec[i].iov_base = (void __user *) page_address(page);
54415+ vec[i].iov_base = (__force void __user *) page_address(page);
54416 vec[i].iov_len = this_len;
54417 pages[i] = page;
54418 spd.nr_pages++;
54419@@ -800,10 +804,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
54420 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
54421 {
54422 while (!pipe->nrbufs) {
54423- if (!pipe->writers)
54424+ if (!atomic_read(&pipe->writers))
54425 return 0;
54426
54427- if (!pipe->waiting_writers && sd->num_spliced)
54428+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
54429 return 0;
54430
54431 if (sd->flags & SPLICE_F_NONBLOCK)
54432@@ -1140,7 +1144,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
54433 * out of the pipe right after the splice_to_pipe(). So set
54434 * PIPE_READERS appropriately.
54435 */
54436- pipe->readers = 1;
54437+ atomic_set(&pipe->readers, 1);
54438
54439 current->splice_pipe = pipe;
54440 }
54441@@ -1593,6 +1597,8 @@ static long vmsplice_to_pipe(struct file *file, const struct iovec __user *iov,
54442 .spd_release = spd_release_page,
54443 };
54444
54445+ pax_track_stack();
54446+
54447 pipe = pipe_info(file->f_path.dentry->d_inode);
54448 if (!pipe)
54449 return -EBADF;
54450@@ -1701,9 +1707,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
54451 ret = -ERESTARTSYS;
54452 break;
54453 }
54454- if (!pipe->writers)
54455+ if (!atomic_read(&pipe->writers))
54456 break;
54457- if (!pipe->waiting_writers) {
54458+ if (!atomic_read(&pipe->waiting_writers)) {
54459 if (flags & SPLICE_F_NONBLOCK) {
54460 ret = -EAGAIN;
54461 break;
54462@@ -1735,7 +1741,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
54463 pipe_lock(pipe);
54464
54465 while (pipe->nrbufs >= PIPE_BUFFERS) {
54466- if (!pipe->readers) {
54467+ if (!atomic_read(&pipe->readers)) {
54468 send_sig(SIGPIPE, current, 0);
54469 ret = -EPIPE;
54470 break;
54471@@ -1748,9 +1754,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
54472 ret = -ERESTARTSYS;
54473 break;
54474 }
54475- pipe->waiting_writers++;
54476+ atomic_inc(&pipe->waiting_writers);
54477 pipe_wait(pipe);
54478- pipe->waiting_writers--;
54479+ atomic_dec(&pipe->waiting_writers);
54480 }
54481
54482 pipe_unlock(pipe);
54483@@ -1786,14 +1792,14 @@ retry:
54484 pipe_double_lock(ipipe, opipe);
54485
54486 do {
54487- if (!opipe->readers) {
54488+ if (!atomic_read(&opipe->readers)) {
54489 send_sig(SIGPIPE, current, 0);
54490 if (!ret)
54491 ret = -EPIPE;
54492 break;
54493 }
54494
54495- if (!ipipe->nrbufs && !ipipe->writers)
54496+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
54497 break;
54498
54499 /*
54500@@ -1893,7 +1899,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
54501 pipe_double_lock(ipipe, opipe);
54502
54503 do {
54504- if (!opipe->readers) {
54505+ if (!atomic_read(&opipe->readers)) {
54506 send_sig(SIGPIPE, current, 0);
54507 if (!ret)
54508 ret = -EPIPE;
54509@@ -1938,7 +1944,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
54510 * return EAGAIN if we have the potential of some data in the
54511 * future, otherwise just return 0
54512 */
54513- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
54514+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
54515 ret = -EAGAIN;
54516
54517 pipe_unlock(ipipe);
54518diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
54519index e020183..18d64b4 100644
54520--- a/fs/sysfs/dir.c
54521+++ b/fs/sysfs/dir.c
54522@@ -678,6 +678,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
54523 struct sysfs_dirent *sd;
54524 int rc;
54525
54526+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
54527+ const char *parent_name = parent_sd->s_name;
54528+
54529+ mode = S_IFDIR | S_IRWXU;
54530+
54531+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
54532+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
54533+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse"))) ||
54534+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
54535+ mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
54536+#endif
54537+
54538 /* allocate */
54539 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
54540 if (!sd)
54541diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
54542index 7118a38..70af853 100644
54543--- a/fs/sysfs/file.c
54544+++ b/fs/sysfs/file.c
54545@@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
54546
54547 struct sysfs_open_dirent {
54548 atomic_t refcnt;
54549- atomic_t event;
54550+ atomic_unchecked_t event;
54551 wait_queue_head_t poll;
54552 struct list_head buffers; /* goes through sysfs_buffer.list */
54553 };
54554@@ -53,7 +53,7 @@ struct sysfs_buffer {
54555 size_t count;
54556 loff_t pos;
54557 char * page;
54558- struct sysfs_ops * ops;
54559+ const struct sysfs_ops * ops;
54560 struct mutex mutex;
54561 int needs_read_fill;
54562 int event;
54563@@ -75,7 +75,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
54564 {
54565 struct sysfs_dirent *attr_sd = dentry->d_fsdata;
54566 struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
54567- struct sysfs_ops * ops = buffer->ops;
54568+ const struct sysfs_ops * ops = buffer->ops;
54569 int ret = 0;
54570 ssize_t count;
54571
54572@@ -88,7 +88,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
54573 if (!sysfs_get_active_two(attr_sd))
54574 return -ENODEV;
54575
54576- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
54577+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
54578 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
54579
54580 sysfs_put_active_two(attr_sd);
54581@@ -199,7 +199,7 @@ flush_write_buffer(struct dentry * dentry, struct sysfs_buffer * buffer, size_t
54582 {
54583 struct sysfs_dirent *attr_sd = dentry->d_fsdata;
54584 struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
54585- struct sysfs_ops * ops = buffer->ops;
54586+ const struct sysfs_ops * ops = buffer->ops;
54587 int rc;
54588
54589 /* need attr_sd for attr and ops, its parent for kobj */
54590@@ -294,7 +294,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
54591 return -ENOMEM;
54592
54593 atomic_set(&new_od->refcnt, 0);
54594- atomic_set(&new_od->event, 1);
54595+ atomic_set_unchecked(&new_od->event, 1);
54596 init_waitqueue_head(&new_od->poll);
54597 INIT_LIST_HEAD(&new_od->buffers);
54598 goto retry;
54599@@ -335,7 +335,7 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
54600 struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
54601 struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
54602 struct sysfs_buffer *buffer;
54603- struct sysfs_ops *ops;
54604+ const struct sysfs_ops *ops;
54605 int error = -EACCES;
54606 char *p;
54607
54608@@ -444,7 +444,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
54609
54610 sysfs_put_active_two(attr_sd);
54611
54612- if (buffer->event != atomic_read(&od->event))
54613+ if (buffer->event != atomic_read_unchecked(&od->event))
54614 goto trigger;
54615
54616 return DEFAULT_POLLMASK;
54617@@ -463,7 +463,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
54618
54619 od = sd->s_attr.open;
54620 if (od) {
54621- atomic_inc(&od->event);
54622+ atomic_inc_unchecked(&od->event);
54623 wake_up_interruptible(&od->poll);
54624 }
54625
54626diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
54627index c5081ad..342ea86 100644
54628--- a/fs/sysfs/symlink.c
54629+++ b/fs/sysfs/symlink.c
54630@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
54631
54632 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
54633 {
54634- char *page = nd_get_link(nd);
54635+ const char *page = nd_get_link(nd);
54636 if (!IS_ERR(page))
54637 free_page((unsigned long)page);
54638 }
54639diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
54640index 1e06853..b06d325 100644
54641--- a/fs/udf/balloc.c
54642+++ b/fs/udf/balloc.c
54643@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struct super_block *sb,
54644
54645 mutex_lock(&sbi->s_alloc_mutex);
54646 partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];
54647- if (bloc->logicalBlockNum < 0 ||
54648- (bloc->logicalBlockNum + count) >
54649- partmap->s_partition_len) {
54650+ if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) {
54651 udf_debug("%d < %d || %d + %d > %d\n",
54652 bloc->logicalBlockNum, 0, bloc->logicalBlockNum,
54653 count, partmap->s_partition_len);
54654@@ -436,9 +434,7 @@ static void udf_table_free_blocks(struct super_block *sb,
54655
54656 mutex_lock(&sbi->s_alloc_mutex);
54657 partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];
54658- if (bloc->logicalBlockNum < 0 ||
54659- (bloc->logicalBlockNum + count) >
54660- partmap->s_partition_len) {
54661+ if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) {
54662 udf_debug("%d < %d || %d + %d > %d\n",
54663 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
54664 partmap->s_partition_len);
54665diff --git a/fs/udf/inode.c b/fs/udf/inode.c
54666index 6d24c2c..fff470f 100644
54667--- a/fs/udf/inode.c
54668+++ b/fs/udf/inode.c
54669@@ -484,6 +484,8 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
54670 int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
54671 int lastblock = 0;
54672
54673+ pax_track_stack();
54674+
54675 prev_epos.offset = udf_file_entry_alloc_offset(inode);
54676 prev_epos.block = iinfo->i_location;
54677 prev_epos.bh = NULL;
54678diff --git a/fs/udf/misc.c b/fs/udf/misc.c
54679index 9215700..bf1f68e 100644
54680--- a/fs/udf/misc.c
54681+++ b/fs/udf/misc.c
54682@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
54683
54684 u8 udf_tag_checksum(const struct tag *t)
54685 {
54686- u8 *data = (u8 *)t;
54687+ const u8 *data = (const u8 *)t;
54688 u8 checksum = 0;
54689 int i;
54690 for (i = 0; i < sizeof(struct tag); ++i)
54691diff --git a/fs/utimes.c b/fs/utimes.c
54692index e4c75db..b4df0e0 100644
54693--- a/fs/utimes.c
54694+++ b/fs/utimes.c
54695@@ -1,6 +1,7 @@
54696 #include <linux/compiler.h>
54697 #include <linux/file.h>
54698 #include <linux/fs.h>
54699+#include <linux/security.h>
54700 #include <linux/linkage.h>
54701 #include <linux/mount.h>
54702 #include <linux/namei.h>
54703@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
54704 goto mnt_drop_write_and_out;
54705 }
54706 }
54707+
54708+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
54709+ error = -EACCES;
54710+ goto mnt_drop_write_and_out;
54711+ }
54712+
54713 mutex_lock(&inode->i_mutex);
54714 error = notify_change(path->dentry, &newattrs);
54715 mutex_unlock(&inode->i_mutex);
54716diff --git a/fs/xattr.c b/fs/xattr.c
54717index 6d4f6d3..cda3958 100644
54718--- a/fs/xattr.c
54719+++ b/fs/xattr.c
54720@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
54721 * Extended attribute SET operations
54722 */
54723 static long
54724-setxattr(struct dentry *d, const char __user *name, const void __user *value,
54725+setxattr(struct path *path, const char __user *name, const void __user *value,
54726 size_t size, int flags)
54727 {
54728 int error;
54729@@ -271,7 +271,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
54730 return PTR_ERR(kvalue);
54731 }
54732
54733- error = vfs_setxattr(d, kname, kvalue, size, flags);
54734+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
54735+ error = -EACCES;
54736+ goto out;
54737+ }
54738+
54739+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
54740+out:
54741 kfree(kvalue);
54742 return error;
54743 }
54744@@ -288,7 +294,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
54745 return error;
54746 error = mnt_want_write(path.mnt);
54747 if (!error) {
54748- error = setxattr(path.dentry, name, value, size, flags);
54749+ error = setxattr(&path, name, value, size, flags);
54750 mnt_drop_write(path.mnt);
54751 }
54752 path_put(&path);
54753@@ -307,7 +313,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
54754 return error;
54755 error = mnt_want_write(path.mnt);
54756 if (!error) {
54757- error = setxattr(path.dentry, name, value, size, flags);
54758+ error = setxattr(&path, name, value, size, flags);
54759 mnt_drop_write(path.mnt);
54760 }
54761 path_put(&path);
54762@@ -318,17 +324,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
54763 const void __user *,value, size_t, size, int, flags)
54764 {
54765 struct file *f;
54766- struct dentry *dentry;
54767 int error = -EBADF;
54768
54769 f = fget(fd);
54770 if (!f)
54771 return error;
54772- dentry = f->f_path.dentry;
54773- audit_inode(NULL, dentry);
54774+ audit_inode(NULL, f->f_path.dentry);
54775 error = mnt_want_write_file(f);
54776 if (!error) {
54777- error = setxattr(dentry, name, value, size, flags);
54778+ error = setxattr(&f->f_path, name, value, size, flags);
54779 mnt_drop_write(f->f_path.mnt);
54780 }
54781 fput(f);
54782diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
54783index c6ad7c7..f2847a7 100644
54784--- a/fs/xattr_acl.c
54785+++ b/fs/xattr_acl.c
54786@@ -17,8 +17,8 @@
54787 struct posix_acl *
54788 posix_acl_from_xattr(const void *value, size_t size)
54789 {
54790- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
54791- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
54792+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
54793+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
54794 int count;
54795 struct posix_acl *acl;
54796 struct posix_acl_entry *acl_e;
54797diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
54798index 942362f..88f96f5 100644
54799--- a/fs/xfs/linux-2.6/xfs_ioctl.c
54800+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
54801@@ -134,7 +134,7 @@ xfs_find_handle(
54802 }
54803
54804 error = -EFAULT;
54805- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
54806+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
54807 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
54808 goto out_put;
54809
54810@@ -423,7 +423,7 @@ xfs_attrlist_by_handle(
54811 if (IS_ERR(dentry))
54812 return PTR_ERR(dentry);
54813
54814- kbuf = kmalloc(al_hreq.buflen, GFP_KERNEL);
54815+ kbuf = kzalloc(al_hreq.buflen, GFP_KERNEL);
54816 if (!kbuf)
54817 goto out_dput;
54818
54819@@ -697,7 +697,7 @@ xfs_ioc_fsgeometry_v1(
54820 xfs_mount_t *mp,
54821 void __user *arg)
54822 {
54823- xfs_fsop_geom_t fsgeo;
54824+ xfs_fsop_geom_t fsgeo;
54825 int error;
54826
54827 error = xfs_fs_geometry(mp, &fsgeo, 3);
54828diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c
54829index bad485a..479bd32 100644
54830--- a/fs/xfs/linux-2.6/xfs_ioctl32.c
54831+++ b/fs/xfs/linux-2.6/xfs_ioctl32.c
54832@@ -75,6 +75,7 @@ xfs_compat_ioc_fsgeometry_v1(
54833 xfs_fsop_geom_t fsgeo;
54834 int error;
54835
54836+ memset(&fsgeo, 0, sizeof(fsgeo));
54837 error = xfs_fs_geometry(mp, &fsgeo, 3);
54838 if (error)
54839 return -error;
54840diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
54841index 1f3b4b8..6102f6d 100644
54842--- a/fs/xfs/linux-2.6/xfs_iops.c
54843+++ b/fs/xfs/linux-2.6/xfs_iops.c
54844@@ -468,7 +468,7 @@ xfs_vn_put_link(
54845 struct nameidata *nd,
54846 void *p)
54847 {
54848- char *s = nd_get_link(nd);
54849+ const char *s = nd_get_link(nd);
54850
54851 if (!IS_ERR(s))
54852 kfree(s);
54853diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
54854index 8971fb0..5fc1eb2 100644
54855--- a/fs/xfs/xfs_bmap.c
54856+++ b/fs/xfs/xfs_bmap.c
54857@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
54858 int nmap,
54859 int ret_nmap);
54860 #else
54861-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
54862+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
54863 #endif /* DEBUG */
54864
54865 #if defined(XFS_RW_TRACE)
54866diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
54867index e89734e..5e84d8d 100644
54868--- a/fs/xfs/xfs_dir2_sf.c
54869+++ b/fs/xfs/xfs_dir2_sf.c
54870@@ -779,7 +779,15 @@ xfs_dir2_sf_getdents(
54871 }
54872
54873 ino = xfs_dir2_sf_get_inumber(sfp, xfs_dir2_sf_inumberp(sfep));
54874- if (filldir(dirent, sfep->name, sfep->namelen,
54875+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
54876+ char name[sfep->namelen];
54877+ memcpy(name, sfep->name, sfep->namelen);
54878+ if (filldir(dirent, name, sfep->namelen,
54879+ off & 0x7fffffff, ino, DT_UNKNOWN)) {
54880+ *offset = off & 0x7fffffff;
54881+ return 0;
54882+ }
54883+ } else if (filldir(dirent, sfep->name, sfep->namelen,
54884 off & 0x7fffffff, ino, DT_UNKNOWN)) {
54885 *offset = off & 0x7fffffff;
54886 return 0;
54887diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
54888index 8f32f50..b6a41e8 100644
54889--- a/fs/xfs/xfs_vnodeops.c
54890+++ b/fs/xfs/xfs_vnodeops.c
54891@@ -564,13 +564,18 @@ xfs_readlink(
54892
54893 xfs_ilock(ip, XFS_ILOCK_SHARED);
54894
54895- ASSERT((ip->i_d.di_mode & S_IFMT) == S_IFLNK);
54896- ASSERT(ip->i_d.di_size <= MAXPATHLEN);
54897-
54898 pathlen = ip->i_d.di_size;
54899 if (!pathlen)
54900 goto out;
54901
54902+ if (pathlen > MAXPATHLEN) {
54903+ xfs_fs_cmn_err(CE_ALERT, mp, "%s: inode (%llu) symlink length (%d) too long",
54904+ __func__, (unsigned long long)ip->i_ino, pathlen);
54905+ ASSERT(0);
54906+ error = XFS_ERROR(EFSCORRUPTED);
54907+ goto out;
54908+ }
54909+
54910 if (ip->i_df.if_flags & XFS_IFINLINE) {
54911 memcpy(link, ip->i_df.if_u1.if_data, pathlen);
54912 link[pathlen] = '\0';
54913diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
54914new file mode 100644
54915index 0000000..9ac9020
54916--- /dev/null
54917+++ b/grsecurity/Kconfig
54918@@ -0,0 +1,1072 @@
54919+#
54920+# grecurity configuration
54921+#
54922+
54923+menu "Grsecurity"
54924+
54925+config GRKERNSEC
54926+ bool "Grsecurity"
54927+ select CRYPTO
54928+ select CRYPTO_SHA256
54929+ help
54930+ If you say Y here, you will be able to configure many features
54931+ that will enhance the security of your system. It is highly
54932+ recommended that you say Y here and read through the help
54933+ for each option so that you fully understand the features and
54934+ can evaluate their usefulness for your machine.
54935+
54936+choice
54937+ prompt "Security Level"
54938+ depends on GRKERNSEC
54939+ default GRKERNSEC_CUSTOM
54940+
54941+config GRKERNSEC_LOW
54942+ bool "Low"
54943+ select GRKERNSEC_LINK
54944+ select GRKERNSEC_FIFO
54945+ select GRKERNSEC_RANDNET
54946+ select GRKERNSEC_DMESG
54947+ select GRKERNSEC_CHROOT
54948+ select GRKERNSEC_CHROOT_CHDIR
54949+
54950+ help
54951+ If you choose this option, several of the grsecurity options will
54952+ be enabled that will give you greater protection against a number
54953+ of attacks, while assuring that none of your software will have any
54954+ conflicts with the additional security measures. If you run a lot
54955+ of unusual software, or you are having problems with the higher
54956+ security levels, you should say Y here. With this option, the
54957+ following features are enabled:
54958+
54959+ - Linking restrictions
54960+ - FIFO restrictions
54961+ - Restricted dmesg
54962+ - Enforced chdir("/") on chroot
54963+ - Runtime module disabling
54964+
54965+config GRKERNSEC_MEDIUM
54966+ bool "Medium"
54967+ select PAX
54968+ select PAX_EI_PAX
54969+ select PAX_PT_PAX_FLAGS
54970+ select PAX_HAVE_ACL_FLAGS
54971+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
54972+ select GRKERNSEC_CHROOT
54973+ select GRKERNSEC_CHROOT_SYSCTL
54974+ select GRKERNSEC_LINK
54975+ select GRKERNSEC_FIFO
54976+ select GRKERNSEC_DMESG
54977+ select GRKERNSEC_RANDNET
54978+ select GRKERNSEC_FORKFAIL
54979+ select GRKERNSEC_TIME
54980+ select GRKERNSEC_SIGNAL
54981+ select GRKERNSEC_CHROOT
54982+ select GRKERNSEC_CHROOT_UNIX
54983+ select GRKERNSEC_CHROOT_MOUNT
54984+ select GRKERNSEC_CHROOT_PIVOT
54985+ select GRKERNSEC_CHROOT_DOUBLE
54986+ select GRKERNSEC_CHROOT_CHDIR
54987+ select GRKERNSEC_CHROOT_MKNOD
54988+ select GRKERNSEC_PROC
54989+ select GRKERNSEC_PROC_USERGROUP
54990+ select PAX_RANDUSTACK
54991+ select PAX_ASLR
54992+ select PAX_RANDMMAP
54993+ select PAX_REFCOUNT if (X86 || SPARC64)
54994+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
54995+
54996+ help
54997+ If you say Y here, several features in addition to those included
54998+ in the low additional security level will be enabled. These
54999+ features provide even more security to your system, though in rare
55000+ cases they may be incompatible with very old or poorly written
55001+ software. If you enable this option, make sure that your auth
55002+ service (identd) is running as gid 1001. With this option,
55003+ the following features (in addition to those provided in the
55004+ low additional security level) will be enabled:
55005+
55006+ - Failed fork logging
55007+ - Time change logging
55008+ - Signal logging
55009+ - Deny mounts in chroot
55010+ - Deny double chrooting
55011+ - Deny sysctl writes in chroot
55012+ - Deny mknod in chroot
55013+ - Deny access to abstract AF_UNIX sockets out of chroot
55014+ - Deny pivot_root in chroot
55015+ - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
55016+ - /proc restrictions with special GID set to 10 (usually wheel)
55017+ - Address Space Layout Randomization (ASLR)
55018+ - Prevent exploitation of most refcount overflows
55019+ - Bounds checking of copying between the kernel and userland
55020+
55021+config GRKERNSEC_HIGH
55022+ bool "High"
55023+ select GRKERNSEC_LINK
55024+ select GRKERNSEC_FIFO
55025+ select GRKERNSEC_DMESG
55026+ select GRKERNSEC_FORKFAIL
55027+ select GRKERNSEC_TIME
55028+ select GRKERNSEC_SIGNAL
55029+ select GRKERNSEC_CHROOT
55030+ select GRKERNSEC_CHROOT_SHMAT
55031+ select GRKERNSEC_CHROOT_UNIX
55032+ select GRKERNSEC_CHROOT_MOUNT
55033+ select GRKERNSEC_CHROOT_FCHDIR
55034+ select GRKERNSEC_CHROOT_PIVOT
55035+ select GRKERNSEC_CHROOT_DOUBLE
55036+ select GRKERNSEC_CHROOT_CHDIR
55037+ select GRKERNSEC_CHROOT_MKNOD
55038+ select GRKERNSEC_CHROOT_CAPS
55039+ select GRKERNSEC_CHROOT_SYSCTL
55040+ select GRKERNSEC_CHROOT_FINDTASK
55041+ select GRKERNSEC_SYSFS_RESTRICT
55042+ select GRKERNSEC_PROC
55043+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
55044+ select GRKERNSEC_HIDESYM
55045+ select GRKERNSEC_BRUTE
55046+ select GRKERNSEC_PROC_USERGROUP
55047+ select GRKERNSEC_KMEM
55048+ select GRKERNSEC_RESLOG
55049+ select GRKERNSEC_RANDNET
55050+ select GRKERNSEC_PROC_ADD
55051+ select GRKERNSEC_CHROOT_CHMOD
55052+ select GRKERNSEC_CHROOT_NICE
55053+ select GRKERNSEC_SETXID
55054+ select GRKERNSEC_AUDIT_MOUNT
55055+ select GRKERNSEC_MODHARDEN if (MODULES)
55056+ select GRKERNSEC_HARDEN_PTRACE
55057+ select GRKERNSEC_PTRACE_READEXEC
55058+ select GRKERNSEC_VM86 if (X86_32)
55059+ select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC)
55060+ select PAX
55061+ select PAX_RANDUSTACK
55062+ select PAX_ASLR
55063+ select PAX_RANDMMAP
55064+ select PAX_NOEXEC
55065+ select PAX_MPROTECT
55066+ select PAX_EI_PAX
55067+ select PAX_PT_PAX_FLAGS
55068+ select PAX_HAVE_ACL_FLAGS
55069+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
55070+ select PAX_MEMORY_UDEREF if (X86 && !XEN)
55071+ select PAX_RANDKSTACK if (X86_TSC && X86)
55072+ select PAX_SEGMEXEC if (X86_32)
55073+ select PAX_PAGEEXEC
55074+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC)
55075+ select PAX_EMUTRAMP if (PARISC)
55076+ select PAX_EMUSIGRT if (PARISC)
55077+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
55078+ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
55079+ select PAX_REFCOUNT if (X86 || SPARC64)
55080+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
55081+ help
55082+ If you say Y here, many of the features of grsecurity will be
55083+ enabled, which will protect you against many kinds of attacks
55084+ against your system. The heightened security comes at a cost
55085+ of an increased chance of incompatibilities with rare software
55086+ on your machine. Since this security level enables PaX, you should
55087+ view <http://pax.grsecurity.net> and read about the PaX
55088+ project. While you are there, download chpax and run it on
55089+ binaries that cause problems with PaX. Also remember that
55090+ since the /proc restrictions are enabled, you must run your
55091+ identd as gid 1001. This security level enables the following
55092+ features in addition to those listed in the low and medium
55093+ security levels:
55094+
55095+ - Additional /proc restrictions
55096+ - Chmod restrictions in chroot
55097+ - No signals, ptrace, or viewing of processes outside of chroot
55098+ - Capability restrictions in chroot
55099+ - Deny fchdir out of chroot
55100+ - Priority restrictions in chroot
55101+ - Segmentation-based implementation of PaX
55102+ - Mprotect restrictions
55103+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
55104+ - Kernel stack randomization
55105+ - Mount/unmount/remount logging
55106+ - Kernel symbol hiding
55107+ - Hardening of module auto-loading
55108+ - Ptrace restrictions
55109+ - Restricted vm86 mode
55110+ - Restricted sysfs/debugfs
55111+ - Active kernel exploit response
55112+
55113+config GRKERNSEC_CUSTOM
55114+ bool "Custom"
55115+ help
55116+ If you say Y here, you will be able to configure every grsecurity
55117+ option, which allows you to enable many more features that aren't
55118+ covered in the basic security levels. These additional features
55119+ include TPE, socket restrictions, and the sysctl system for
55120+ grsecurity. It is advised that you read through the help for
55121+ each option to determine its usefulness in your situation.
55122+
55123+endchoice
55124+
55125+menu "Address Space Protection"
55126+depends on GRKERNSEC
55127+
55128+config GRKERNSEC_KMEM
55129+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
55130+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
55131+ help
55132+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
55133+ be written to or read from to modify or leak the contents of the running
55134+ kernel. /dev/port will also not be allowed to be opened. If you have module
55135+ support disabled, enabling this will close up four ways that are
55136+ currently used to insert malicious code into the running kernel.
55137+ Even with all these features enabled, we still highly recommend that
55138+ you use the RBAC system, as it is still possible for an attacker to
55139+ modify the running kernel through privileged I/O granted by ioperm/iopl.
55140+ If you are not using XFree86, you may be able to stop this additional
55141+ case by enabling the 'Disable privileged I/O' option. Though nothing
55142+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
55143+ but only to video memory, which is the only writing we allow in this
55144+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
55145+ not be allowed to mprotect it with PROT_WRITE later.
55146+ It is highly recommended that you say Y here if you meet all the
55147+ conditions above.
55148+
55149+config GRKERNSEC_VM86
55150+ bool "Restrict VM86 mode"
55151+ depends on X86_32
55152+
55153+ help
55154+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
55155+ make use of a special execution mode on 32bit x86 processors called
55156+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
55157+ video cards and will still work with this option enabled. The purpose
55158+ of the option is to prevent exploitation of emulation errors in
55159+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
55160+ Nearly all users should be able to enable this option.
55161+
55162+config GRKERNSEC_IO
55163+ bool "Disable privileged I/O"
55164+ depends on X86
55165+ select RTC_CLASS
55166+ select RTC_INTF_DEV
55167+ select RTC_DRV_CMOS
55168+
55169+ help
55170+ If you say Y here, all ioperm and iopl calls will return an error.
55171+ Ioperm and iopl can be used to modify the running kernel.
55172+ Unfortunately, some programs need this access to operate properly,
55173+ the most notable of which are XFree86 and hwclock. hwclock can be
55174+ remedied by having RTC support in the kernel, so real-time
55175+ clock support is enabled if this option is enabled, to ensure
55176+ that hwclock operates correctly. XFree86 still will not
55177+ operate correctly with this option enabled, so DO NOT CHOOSE Y
55178+ IF YOU USE XFree86. If you use XFree86 and you still want to
55179+ protect your kernel against modification, use the RBAC system.
55180+
55181+config GRKERNSEC_PROC_MEMMAP
55182+ bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
55183+ default y if (PAX_NOEXEC || PAX_ASLR)
55184+ depends on PAX_NOEXEC || PAX_ASLR
55185+ help
55186+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
55187+ give no information about the addresses of its mappings if
55188+ PaX features that rely on random addresses are enabled on the task.
55189+ In addition to sanitizing this information and disabling other
55190+ dangerous sources of information, this option causes reads of sensitive
55191+ /proc/<pid> entries where the file descriptor was opened in a different
55192+ task than the one performing the read. Such attempts are logged.
55193+ If you use PaX it is greatly recommended that you say Y here as it
55194+ closes up a hole that makes the full ASLR useless for suid
55195+ binaries.
55196+
55197+config GRKERNSEC_BRUTE
55198+ bool "Deter exploit bruteforcing"
55199+ help
55200+ If you say Y here, attempts to bruteforce exploits against forking
55201+ daemons such as apache or sshd, as well as against suid/sgid binaries
55202+ will be deterred. When a child of a forking daemon is killed by PaX
55203+ or crashes due to an illegal instruction or other suspicious signal,
55204+ the parent process will be delayed 30 seconds upon every subsequent
55205+ fork until the administrator is able to assess the situation and
55206+ restart the daemon.
55207+ In the suid/sgid case, the attempt is logged, the user has all their
55208+ processes terminated, and they are prevented from executing any further
55209+ processes for 15 minutes.
55210+ It is recommended that you also enable signal logging in the auditing
55211+ section so that logs are generated when a process triggers a suspicious
55212+ signal.
55213+ If the sysctl option is enabled, a sysctl option with name
55214+ "deter_bruteforce" is created.
55215+
55216+config GRKERNSEC_MODHARDEN
55217+ bool "Harden module auto-loading"
55218+ depends on MODULES
55219+ help
55220+ If you say Y here, module auto-loading in response to use of some
55221+ feature implemented by an unloaded module will be restricted to
55222+ root users. Enabling this option helps defend against attacks
55223+ by unprivileged users who abuse the auto-loading behavior to
55224+ cause a vulnerable module to load that is then exploited.
55225+
55226+ If this option prevents a legitimate use of auto-loading for a
55227+ non-root user, the administrator can execute modprobe manually
55228+ with the exact name of the module mentioned in the alert log.
55229+ Alternatively, the administrator can add the module to the list
55230+ of modules loaded at boot by modifying init scripts.
55231+
55232+ Modification of init scripts will most likely be needed on
55233+ Ubuntu servers with encrypted home directory support enabled,
55234+ as the first non-root user logging in will cause the ecb(aes),
55235+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
55236+
55237+config GRKERNSEC_HIDESYM
55238+ bool "Hide kernel symbols"
55239+ help
55240+ If you say Y here, getting information on loaded modules, and
55241+ displaying all kernel symbols through a syscall will be restricted
55242+ to users with CAP_SYS_MODULE. For software compatibility reasons,
55243+ /proc/kallsyms will be restricted to the root user. The RBAC
55244+ system can hide that entry even from root.
55245+
55246+ This option also prevents leaking of kernel addresses through
55247+ several /proc entries.
55248+
55249+ Note that this option is only effective provided the following
55250+ conditions are met:
55251+ 1) The kernel using grsecurity is not precompiled by some distribution
55252+ 2) You have also enabled GRKERNSEC_DMESG
55253+ 3) You are using the RBAC system and hiding other files such as your
55254+ kernel image and System.map. Alternatively, enabling this option
55255+ causes the permissions on /boot, /lib/modules, and the kernel
55256+ source directory to change at compile time to prevent
55257+ reading by non-root users.
55258+ If the above conditions are met, this option will aid in providing a
55259+ useful protection against local kernel exploitation of overflows
55260+ and arbitrary read/write vulnerabilities.
55261+
55262+config GRKERNSEC_KERN_LOCKOUT
55263+ bool "Active kernel exploit response"
55264+ depends on X86 || ARM || PPC || SPARC
55265+ help
55266+ If you say Y here, when a PaX alert is triggered due to suspicious
55267+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
55268+ or an OOPs occurs due to bad memory accesses, instead of just
55269+ terminating the offending process (and potentially allowing
55270+ a subsequent exploit from the same user), we will take one of two
55271+ actions:
55272+ If the user was root, we will panic the system
55273+ If the user was non-root, we will log the attempt, terminate
55274+ all processes owned by the user, then prevent them from creating
55275+ any new processes until the system is restarted
55276+ This deters repeated kernel exploitation/bruteforcing attempts
55277+ and is useful for later forensics.
55278+
55279+endmenu
55280+menu "Role Based Access Control Options"
55281+depends on GRKERNSEC
55282+
55283+config GRKERNSEC_RBAC_DEBUG
55284+ bool
55285+
55286+config GRKERNSEC_NO_RBAC
55287+ bool "Disable RBAC system"
55288+ help
55289+ If you say Y here, the /dev/grsec device will be removed from the kernel,
55290+ preventing the RBAC system from being enabled. You should only say Y
55291+ here if you have no intention of using the RBAC system, so as to prevent
55292+ an attacker with root access from misusing the RBAC system to hide files
55293+ and processes when loadable module support and /dev/[k]mem have been
55294+ locked down.
55295+
55296+config GRKERNSEC_ACL_HIDEKERN
55297+ bool "Hide kernel processes"
55298+ help
55299+ If you say Y here, all kernel threads will be hidden to all
55300+ processes but those whose subject has the "view hidden processes"
55301+ flag.
55302+
55303+config GRKERNSEC_ACL_MAXTRIES
55304+ int "Maximum tries before password lockout"
55305+ default 3
55306+ help
55307+ This option enforces the maximum number of times a user can attempt
55308+ to authorize themselves with the grsecurity RBAC system before being
55309+ denied the ability to attempt authorization again for a specified time.
55310+ The lower the number, the harder it will be to brute-force a password.
55311+
55312+config GRKERNSEC_ACL_TIMEOUT
55313+ int "Time to wait after max password tries, in seconds"
55314+ default 30
55315+ help
55316+ This option specifies the time the user must wait after attempting to
55317+ authorize to the RBAC system with the maximum number of invalid
55318+ passwords. The higher the number, the harder it will be to brute-force
55319+ a password.
55320+
55321+endmenu
55322+menu "Filesystem Protections"
55323+depends on GRKERNSEC
55324+
55325+config GRKERNSEC_PROC
55326+ bool "Proc restrictions"
55327+ help
55328+ If you say Y here, the permissions of the /proc filesystem
55329+ will be altered to enhance system security and privacy. You MUST
55330+ choose either a user only restriction or a user and group restriction.
55331+ Depending upon the option you choose, you can either restrict users to
55332+ see only the processes they themselves run, or choose a group that can
55333+ view all processes and files normally restricted to root if you choose
55334+ the "restrict to user only" option. NOTE: If you're running identd as
55335+ a non-root user, you will have to run it as the group you specify here.
55336+
55337+config GRKERNSEC_PROC_USER
55338+ bool "Restrict /proc to user only"
55339+ depends on GRKERNSEC_PROC
55340+ help
55341+ If you say Y here, non-root users will only be able to view their own
55342+ processes, and restricts them from viewing network-related information,
55343+ and viewing kernel symbol and module information.
55344+
55345+config GRKERNSEC_PROC_USERGROUP
55346+ bool "Allow special group"
55347+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
55348+ help
55349+ If you say Y here, you will be able to select a group that will be
55350+ able to view all processes and network-related information. If you've
55351+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
55352+ remain hidden. This option is useful if you want to run identd as
55353+ a non-root user.
55354+
55355+config GRKERNSEC_PROC_GID
55356+ int "GID for special group"
55357+ depends on GRKERNSEC_PROC_USERGROUP
55358+ default 1001
55359+
55360+config GRKERNSEC_PROC_ADD
55361+ bool "Additional restrictions"
55362+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
55363+ help
55364+ If you say Y here, additional restrictions will be placed on
55365+ /proc that keep normal users from viewing device information and
55366+ slabinfo information that could be useful for exploits.
55367+
55368+config GRKERNSEC_LINK
55369+ bool "Linking restrictions"
55370+ help
55371+ If you say Y here, /tmp race exploits will be prevented, since users
55372+ will no longer be able to follow symlinks owned by other users in
55373+ world-writable +t directories (e.g. /tmp), unless the owner of the
55374+ symlink is the owner of the directory. users will also not be
55375+ able to hardlink to files they do not own. If the sysctl option is
55376+ enabled, a sysctl option with name "linking_restrictions" is created.
55377+
55378+config GRKERNSEC_FIFO
55379+ bool "FIFO restrictions"
55380+ help
55381+ If you say Y here, users will not be able to write to FIFOs they don't
55382+ own in world-writable +t directories (e.g. /tmp), unless the owner of
55383+ the FIFO is the same owner of the directory it's held in. If the sysctl
55384+ option is enabled, a sysctl option with name "fifo_restrictions" is
55385+ created.
55386+
55387+config GRKERNSEC_SYSFS_RESTRICT
55388+ bool "Sysfs/debugfs restriction"
55389+ depends on SYSFS
55390+ help
55391+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
55392+ any filesystem normally mounted under it (e.g. debugfs) will be
55393+ mostly accessible only by root. These filesystems generally provide access
55394+ to hardware and debug information that isn't appropriate for unprivileged
55395+ users of the system. Sysfs and debugfs have also become a large source
55396+ of new vulnerabilities, ranging from infoleaks to local compromise.
55397+ There has been very little oversight with an eye toward security involved
55398+ in adding new exporters of information to these filesystems, so their
55399+ use is discouraged.
55400+ For reasons of compatibility, a few directories have been whitelisted
55401+ for access by non-root users:
55402+ /sys/fs/selinux
55403+ /sys/fs/fuse
55404+ /sys/devices/system/cpu
55405+
55406+config GRKERNSEC_ROFS
55407+ bool "Runtime read-only mount protection"
55408+ help
55409+ If you say Y here, a sysctl option with name "romount_protect" will
55410+ be created. By setting this option to 1 at runtime, filesystems
55411+ will be protected in the following ways:
55412+ * No new writable mounts will be allowed
55413+ * Existing read-only mounts won't be able to be remounted read/write
55414+ * Write operations will be denied on all block devices
55415+ This option acts independently of grsec_lock: once it is set to 1,
55416+ it cannot be turned off. Therefore, please be mindful of the resulting
55417+ behavior if this option is enabled in an init script on a read-only
55418+ filesystem. This feature is mainly intended for secure embedded systems.
55419+
55420+config GRKERNSEC_CHROOT
55421+ bool "Chroot jail restrictions"
55422+ help
55423+ If you say Y here, you will be able to choose several options that will
55424+ make breaking out of a chrooted jail much more difficult. If you
55425+ encounter no software incompatibilities with the following options, it
55426+ is recommended that you enable each one.
55427+
55428+config GRKERNSEC_CHROOT_MOUNT
55429+ bool "Deny mounts"
55430+ depends on GRKERNSEC_CHROOT
55431+ help
55432+ If you say Y here, processes inside a chroot will not be able to
55433+ mount or remount filesystems. If the sysctl option is enabled, a
55434+ sysctl option with name "chroot_deny_mount" is created.
55435+
55436+config GRKERNSEC_CHROOT_DOUBLE
55437+ bool "Deny double-chroots"
55438+ depends on GRKERNSEC_CHROOT
55439+ help
55440+ If you say Y here, processes inside a chroot will not be able to chroot
55441+ again outside the chroot. This is a widely used method of breaking
55442+ out of a chroot jail and should not be allowed. If the sysctl
55443+ option is enabled, a sysctl option with name
55444+ "chroot_deny_chroot" is created.
55445+
55446+config GRKERNSEC_CHROOT_PIVOT
55447+ bool "Deny pivot_root in chroot"
55448+ depends on GRKERNSEC_CHROOT
55449+ help
55450+ If you say Y here, processes inside a chroot will not be able to use
55451+ a function called pivot_root() that was introduced in Linux 2.3.41. It
55452+ works similar to chroot in that it changes the root filesystem. This
55453+ function could be misused in a chrooted process to attempt to break out
55454+ of the chroot, and therefore should not be allowed. If the sysctl
55455+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
55456+ created.
55457+
55458+config GRKERNSEC_CHROOT_CHDIR
55459+ bool "Enforce chdir(\"/\") on all chroots"
55460+ depends on GRKERNSEC_CHROOT
55461+ help
55462+ If you say Y here, the current working directory of all newly-chrooted
55463+ applications will be set to the the root directory of the chroot.
55464+ The man page on chroot(2) states:
55465+ Note that this call does not change the current working
55466+ directory, so that `.' can be outside the tree rooted at
55467+ `/'. In particular, the super-user can escape from a
55468+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
55469+
55470+ It is recommended that you say Y here, since it's not known to break
55471+ any software. If the sysctl option is enabled, a sysctl option with
55472+ name "chroot_enforce_chdir" is created.
55473+
55474+config GRKERNSEC_CHROOT_CHMOD
55475+ bool "Deny (f)chmod +s"
55476+ depends on GRKERNSEC_CHROOT
55477+ help
55478+ If you say Y here, processes inside a chroot will not be able to chmod
55479+ or fchmod files to make them have suid or sgid bits. This protects
55480+ against another published method of breaking a chroot. If the sysctl
55481+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
55482+ created.
55483+
55484+config GRKERNSEC_CHROOT_FCHDIR
55485+ bool "Deny fchdir out of chroot"
55486+ depends on GRKERNSEC_CHROOT
55487+ help
55488+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
55489+ to a file descriptor of the chrooting process that points to a directory
55490+ outside the filesystem will be stopped. If the sysctl option
55491+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
55492+
55493+config GRKERNSEC_CHROOT_MKNOD
55494+ bool "Deny mknod"
55495+ depends on GRKERNSEC_CHROOT
55496+ help
55497+ If you say Y here, processes inside a chroot will not be allowed to
55498+ mknod. The problem with using mknod inside a chroot is that it
55499+ would allow an attacker to create a device entry that is the same
55500+ as one on the physical root of your system, which could range from
55501+ anything from the console device to a device for your harddrive (which
55502+ they could then use to wipe the drive or steal data). It is recommended
55503+ that you say Y here, unless you run into software incompatibilities.
55504+ If the sysctl option is enabled, a sysctl option with name
55505+ "chroot_deny_mknod" is created.
55506+
55507+config GRKERNSEC_CHROOT_SHMAT
55508+ bool "Deny shmat() out of chroot"
55509+ depends on GRKERNSEC_CHROOT
55510+ help
55511+ If you say Y here, processes inside a chroot will not be able to attach
55512+ to shared memory segments that were created outside of the chroot jail.
55513+ It is recommended that you say Y here. If the sysctl option is enabled,
55514+ a sysctl option with name "chroot_deny_shmat" is created.
55515+
55516+config GRKERNSEC_CHROOT_UNIX
55517+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
55518+ depends on GRKERNSEC_CHROOT
55519+ help
55520+ If you say Y here, processes inside a chroot will not be able to
55521+ connect to abstract (meaning not belonging to a filesystem) Unix
55522+ domain sockets that were bound outside of a chroot. It is recommended
55523+ that you say Y here. If the sysctl option is enabled, a sysctl option
55524+ with name "chroot_deny_unix" is created.
55525+
55526+config GRKERNSEC_CHROOT_FINDTASK
55527+ bool "Protect outside processes"
55528+ depends on GRKERNSEC_CHROOT
55529+ help
55530+ If you say Y here, processes inside a chroot will not be able to
55531+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
55532+ getsid, or view any process outside of the chroot. If the sysctl
55533+ option is enabled, a sysctl option with name "chroot_findtask" is
55534+ created.
55535+
55536+config GRKERNSEC_CHROOT_NICE
55537+ bool "Restrict priority changes"
55538+ depends on GRKERNSEC_CHROOT
55539+ help
55540+ If you say Y here, processes inside a chroot will not be able to raise
55541+ the priority of processes in the chroot, or alter the priority of
55542+ processes outside the chroot. This provides more security than simply
55543+ removing CAP_SYS_NICE from the process' capability set. If the
55544+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
55545+ is created.
55546+
55547+config GRKERNSEC_CHROOT_SYSCTL
55548+ bool "Deny sysctl writes"
55549+ depends on GRKERNSEC_CHROOT
55550+ help
55551+ If you say Y here, an attacker in a chroot will not be able to
55552+ write to sysctl entries, either by sysctl(2) or through a /proc
55553+ interface. It is strongly recommended that you say Y here. If the
55554+ sysctl option is enabled, a sysctl option with name
55555+ "chroot_deny_sysctl" is created.
55556+
55557+config GRKERNSEC_CHROOT_CAPS
55558+ bool "Capability restrictions"
55559+ depends on GRKERNSEC_CHROOT
55560+ help
55561+ If you say Y here, the capabilities on all processes within a
55562+ chroot jail will be lowered to stop module insertion, raw i/o,
55563+ system and net admin tasks, rebooting the system, modifying immutable
55564+ files, modifying IPC owned by another, and changing the system time.
55565+ This is left an option because it can break some apps. Disable this
55566+ if your chrooted apps are having problems performing those kinds of
55567+ tasks. If the sysctl option is enabled, a sysctl option with
55568+ name "chroot_caps" is created.
55569+
55570+endmenu
55571+menu "Kernel Auditing"
55572+depends on GRKERNSEC
55573+
55574+config GRKERNSEC_AUDIT_GROUP
55575+ bool "Single group for auditing"
55576+ help
55577+ If you say Y here, the exec, chdir, and (un)mount logging features
55578+ will only operate on a group you specify. This option is recommended
55579+ if you only want to watch certain users instead of having a large
55580+ amount of logs from the entire system. If the sysctl option is enabled,
55581+ a sysctl option with name "audit_group" is created.
55582+
55583+config GRKERNSEC_AUDIT_GID
55584+ int "GID for auditing"
55585+ depends on GRKERNSEC_AUDIT_GROUP
55586+ default 1007
55587+
55588+config GRKERNSEC_EXECLOG
55589+ bool "Exec logging"
55590+ help
55591+ If you say Y here, all execve() calls will be logged (since the
55592+ other exec*() calls are frontends to execve(), all execution
55593+ will be logged). Useful for shell-servers that like to keep track
55594+ of their users. If the sysctl option is enabled, a sysctl option with
55595+ name "exec_logging" is created.
55596+ WARNING: This option when enabled will produce a LOT of logs, especially
55597+ on an active system.
55598+
55599+config GRKERNSEC_RESLOG
55600+ bool "Resource logging"
55601+ help
55602+ If you say Y here, all attempts to overstep resource limits will
55603+ be logged with the resource name, the requested size, and the current
55604+ limit. It is highly recommended that you say Y here. If the sysctl
55605+ option is enabled, a sysctl option with name "resource_logging" is
55606+ created. If the RBAC system is enabled, the sysctl value is ignored.
55607+
55608+config GRKERNSEC_CHROOT_EXECLOG
55609+ bool "Log execs within chroot"
55610+ help
55611+ If you say Y here, all executions inside a chroot jail will be logged
55612+ to syslog. This can cause a large amount of logs if certain
55613+ applications (eg. djb's daemontools) are installed on the system, and
55614+ is therefore left as an option. If the sysctl option is enabled, a
55615+ sysctl option with name "chroot_execlog" is created.
55616+
55617+config GRKERNSEC_AUDIT_PTRACE
55618+ bool "Ptrace logging"
55619+ help
55620+ If you say Y here, all attempts to attach to a process via ptrace
55621+ will be logged. If the sysctl option is enabled, a sysctl option
55622+ with name "audit_ptrace" is created.
55623+
55624+config GRKERNSEC_AUDIT_CHDIR
55625+ bool "Chdir logging"
55626+ help
55627+ If you say Y here, all chdir() calls will be logged. If the sysctl
55628+ option is enabled, a sysctl option with name "audit_chdir" is created.
55629+
55630+config GRKERNSEC_AUDIT_MOUNT
55631+ bool "(Un)Mount logging"
55632+ help
55633+ If you say Y here, all mounts and unmounts will be logged. If the
55634+ sysctl option is enabled, a sysctl option with name "audit_mount" is
55635+ created.
55636+
55637+config GRKERNSEC_SIGNAL
55638+ bool "Signal logging"
55639+ help
55640+ If you say Y here, certain important signals will be logged, such as
55641+ SIGSEGV, which will as a result inform you of when a error in a program
55642+ occurred, which in some cases could mean a possible exploit attempt.
55643+ If the sysctl option is enabled, a sysctl option with name
55644+ "signal_logging" is created.
55645+
55646+config GRKERNSEC_FORKFAIL
55647+ bool "Fork failure logging"
55648+ help
55649+ If you say Y here, all failed fork() attempts will be logged.
55650+ This could suggest a fork bomb, or someone attempting to overstep
55651+ their process limit. If the sysctl option is enabled, a sysctl option
55652+ with name "forkfail_logging" is created.
55653+
55654+config GRKERNSEC_TIME
55655+ bool "Time change logging"
55656+ help
55657+ If you say Y here, any changes of the system clock will be logged.
55658+ If the sysctl option is enabled, a sysctl option with name
55659+ "timechange_logging" is created.
55660+
55661+config GRKERNSEC_PROC_IPADDR
55662+ bool "/proc/<pid>/ipaddr support"
55663+ help
55664+ If you say Y here, a new entry will be added to each /proc/<pid>
55665+ directory that contains the IP address of the person using the task.
55666+ The IP is carried across local TCP and AF_UNIX stream sockets.
55667+ This information can be useful for IDS/IPSes to perform remote response
55668+ to a local attack. The entry is readable by only the owner of the
55669+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
55670+ the RBAC system), and thus does not create privacy concerns.
55671+
55672+config GRKERNSEC_RWXMAP_LOG
55673+ bool 'Denied RWX mmap/mprotect logging'
55674+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
55675+ help
55676+ If you say Y here, calls to mmap() and mprotect() with explicit
55677+ usage of PROT_WRITE and PROT_EXEC together will be logged when
55678+ denied by the PAX_MPROTECT feature. If the sysctl option is
55679+ enabled, a sysctl option with name "rwxmap_logging" is created.
55680+
55681+config GRKERNSEC_AUDIT_TEXTREL
55682+ bool 'ELF text relocations logging (READ HELP)'
55683+ depends on PAX_MPROTECT
55684+ help
55685+ If you say Y here, text relocations will be logged with the filename
55686+ of the offending library or binary. The purpose of the feature is
55687+ to help Linux distribution developers get rid of libraries and
55688+ binaries that need text relocations which hinder the future progress
55689+ of PaX. Only Linux distribution developers should say Y here, and
55690+ never on a production machine, as this option creates an information
55691+ leak that could aid an attacker in defeating the randomization of
55692+ a single memory region. If the sysctl option is enabled, a sysctl
55693+ option with name "audit_textrel" is created.
55694+
55695+endmenu
55696+
55697+menu "Executable Protections"
55698+depends on GRKERNSEC
55699+
55700+config GRKERNSEC_DMESG
55701+ bool "Dmesg(8) restriction"
55702+ help
55703+ If you say Y here, non-root users will not be able to use dmesg(8)
55704+ to view up to the last 4kb of messages in the kernel's log buffer.
55705+ The kernel's log buffer often contains kernel addresses and other
55706+ identifying information useful to an attacker in fingerprinting a
55707+ system for a targeted exploit.
55708+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
55709+ created.
55710+
55711+config GRKERNSEC_HARDEN_PTRACE
55712+ bool "Deter ptrace-based process snooping"
55713+ help
55714+ If you say Y here, TTY sniffers and other malicious monitoring
55715+ programs implemented through ptrace will be defeated. If you
55716+ have been using the RBAC system, this option has already been
55717+ enabled for several years for all users, with the ability to make
55718+ fine-grained exceptions.
55719+
55720+ This option only affects the ability of non-root users to ptrace
55721+ processes that are not a descendent of the ptracing process.
55722+ This means that strace ./binary and gdb ./binary will still work,
55723+ but attaching to arbitrary processes will not. If the sysctl
55724+ option is enabled, a sysctl option with name "harden_ptrace" is
55725+ created.
55726+
55727+config GRKERNSEC_PTRACE_READEXEC
55728+ bool "Require read access to ptrace sensitive binaries"
55729+ help
55730+ If you say Y here, unprivileged users will not be able to ptrace unreadable
55731+ binaries. This option is useful in environments that
55732+ remove the read bits (e.g. file mode 4711) from suid binaries to
55733+ prevent infoleaking of their contents. This option adds
55734+ consistency to the use of that file mode, as the binary could normally
55735+ be read out when run without privileges while ptracing.
55736+
55737+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
55738+ is created.
55739+
55740+config GRKERNSEC_SETXID
55741+ bool "Enforce consistent multithreaded privileges"
55742+ help
55743+ If you say Y here, a change from a root uid to a non-root uid
55744+ in a multithreaded application will cause the resulting uids,
55745+ gids, supplementary groups, and capabilities in that thread
55746+ to be propagated to the other threads of the process. In most
55747+ cases this is unnecessary, as glibc will emulate this behavior
55748+ on behalf of the application. Other libcs do not act in the
55749+ same way, allowing the other threads of the process to continue
55750+ running with root privileges. If the sysctl option is enabled,
55751+ a sysctl option with name "consistent_setxid" is created.
55752+
55753+config GRKERNSEC_TPE
55754+ bool "Trusted Path Execution (TPE)"
55755+ help
55756+ If you say Y here, you will be able to choose a gid to add to the
55757+ supplementary groups of users you want to mark as "untrusted."
55758+ These users will not be able to execute any files that are not in
55759+ root-owned directories writable only by root. If the sysctl option
55760+ is enabled, a sysctl option with name "tpe" is created.
55761+
55762+config GRKERNSEC_TPE_ALL
55763+ bool "Partially restrict all non-root users"
55764+ depends on GRKERNSEC_TPE
55765+ help
55766+ If you say Y here, all non-root users will be covered under
55767+ a weaker TPE restriction. This is separate from, and in addition to,
55768+ the main TPE options that you have selected elsewhere. Thus, if a
55769+ "trusted" GID is chosen, this restriction applies to even that GID.
55770+ Under this restriction, all non-root users will only be allowed to
55771+ execute files in directories they own that are not group or
55772+ world-writable, or in directories owned by root and writable only by
55773+ root. If the sysctl option is enabled, a sysctl option with name
55774+ "tpe_restrict_all" is created.
55775+
55776+config GRKERNSEC_TPE_INVERT
55777+ bool "Invert GID option"
55778+ depends on GRKERNSEC_TPE
55779+ help
55780+ If you say Y here, the group you specify in the TPE configuration will
55781+ decide what group TPE restrictions will be *disabled* for. This
55782+ option is useful if you want TPE restrictions to be applied to most
55783+ users on the system. If the sysctl option is enabled, a sysctl option
55784+ with name "tpe_invert" is created. Unlike other sysctl options, this
55785+ entry will default to on for backward-compatibility.
55786+
55787+config GRKERNSEC_TPE_GID
55788+ int "GID for untrusted users"
55789+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
55790+ default 1005
55791+ help
55792+ Setting this GID determines what group TPE restrictions will be
55793+ *enabled* for. If the sysctl option is enabled, a sysctl option
55794+ with name "tpe_gid" is created.
55795+
55796+config GRKERNSEC_TPE_GID
55797+ int "GID for trusted users"
55798+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
55799+ default 1005
55800+ help
55801+ Setting this GID determines what group TPE restrictions will be
55802+ *disabled* for. If the sysctl option is enabled, a sysctl option
55803+ with name "tpe_gid" is created.
55804+
55805+endmenu
55806+menu "Network Protections"
55807+depends on GRKERNSEC
55808+
55809+config GRKERNSEC_RANDNET
55810+ bool "Larger entropy pools"
55811+ help
55812+ If you say Y here, the entropy pools used for many features of Linux
55813+ and grsecurity will be doubled in size. Since several grsecurity
55814+ features use additional randomness, it is recommended that you say Y
55815+ here. Saying Y here has a similar effect as modifying
55816+ /proc/sys/kernel/random/poolsize.
55817+
55818+config GRKERNSEC_BLACKHOLE
55819+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
55820+ depends on NET
55821+ help
55822+ If you say Y here, neither TCP resets nor ICMP
55823+ destination-unreachable packets will be sent in response to packets
55824+ sent to ports for which no associated listening process exists.
55825+ This feature supports both IPV4 and IPV6 and exempts the
55826+ loopback interface from blackholing. Enabling this feature
55827+ makes a host more resilient to DoS attacks and reduces network
55828+ visibility against scanners.
55829+
55830+ The blackhole feature as-implemented is equivalent to the FreeBSD
55831+ blackhole feature, as it prevents RST responses to all packets, not
55832+ just SYNs. Under most application behavior this causes no
55833+ problems, but applications (like haproxy) may not close certain
55834+ connections in a way that cleanly terminates them on the remote
55835+ end, leaving the remote host in LAST_ACK state. Because of this
55836+ side-effect and to prevent intentional LAST_ACK DoSes, this
55837+ feature also adds automatic mitigation against such attacks.
55838+ The mitigation drastically reduces the amount of time a socket
55839+ can spend in LAST_ACK state. If you're using haproxy and not
55840+ all servers it connects to have this option enabled, consider
55841+ disabling this feature on the haproxy host.
55842+
55843+ If the sysctl option is enabled, two sysctl options with names
55844+ "ip_blackhole" and "lastack_retries" will be created.
55845+ While "ip_blackhole" takes the standard zero/non-zero on/off
55846+ toggle, "lastack_retries" uses the same kinds of values as
55847+ "tcp_retries1" and "tcp_retries2". The default value of 4
55848+ prevents a socket from lasting more than 45 seconds in LAST_ACK
55849+ state.
55850+
55851+config GRKERNSEC_SOCKET
55852+ bool "Socket restrictions"
55853+ depends on NET
55854+ help
55855+ If you say Y here, you will be able to choose from several options.
55856+ If you assign a GID on your system and add it to the supplementary
55857+ groups of users you want to restrict socket access to, this patch
55858+ will perform up to three things, based on the option(s) you choose.
55859+
55860+config GRKERNSEC_SOCKET_ALL
55861+ bool "Deny any sockets to group"
55862+ depends on GRKERNSEC_SOCKET
55863+ help
55864+ If you say Y here, you will be able to choose a GID of whose users will
55865+ be unable to connect to other hosts from your machine or run server
55866+ applications from your machine. If the sysctl option is enabled, a
55867+ sysctl option with name "socket_all" is created.
55868+
55869+config GRKERNSEC_SOCKET_ALL_GID
55870+ int "GID to deny all sockets for"
55871+ depends on GRKERNSEC_SOCKET_ALL
55872+ default 1004
55873+ help
55874+ Here you can choose the GID to disable socket access for. Remember to
55875+ add the users you want socket access disabled for to the GID
55876+ specified here. If the sysctl option is enabled, a sysctl option
55877+ with name "socket_all_gid" is created.
55878+
55879+config GRKERNSEC_SOCKET_CLIENT
55880+ bool "Deny client sockets to group"
55881+ depends on GRKERNSEC_SOCKET
55882+ help
55883+ If you say Y here, you will be able to choose a GID of whose users will
55884+ be unable to connect to other hosts from your machine, but will be
55885+ able to run servers. If this option is enabled, all users in the group
55886+ you specify will have to use passive mode when initiating ftp transfers
55887+ from the shell on your machine. If the sysctl option is enabled, a
55888+ sysctl option with name "socket_client" is created.
55889+
55890+config GRKERNSEC_SOCKET_CLIENT_GID
55891+ int "GID to deny client sockets for"
55892+ depends on GRKERNSEC_SOCKET_CLIENT
55893+ default 1003
55894+ help
55895+ Here you can choose the GID to disable client socket access for.
55896+ Remember to add the users you want client socket access disabled for to
55897+ the GID specified here. If the sysctl option is enabled, a sysctl
55898+ option with name "socket_client_gid" is created.
55899+
55900+config GRKERNSEC_SOCKET_SERVER
55901+ bool "Deny server sockets to group"
55902+ depends on GRKERNSEC_SOCKET
55903+ help
55904+ If you say Y here, you will be able to choose a GID of whose users will
55905+ be unable to run server applications from your machine. If the sysctl
55906+ option is enabled, a sysctl option with name "socket_server" is created.
55907+
55908+config GRKERNSEC_SOCKET_SERVER_GID
55909+ int "GID to deny server sockets for"
55910+ depends on GRKERNSEC_SOCKET_SERVER
55911+ default 1002
55912+ help
55913+ Here you can choose the GID to disable server socket access for.
55914+ Remember to add the users you want server socket access disabled for to
55915+ the GID specified here. If the sysctl option is enabled, a sysctl
55916+ option with name "socket_server_gid" is created.
55917+
55918+endmenu
55919+menu "Sysctl support"
55920+depends on GRKERNSEC && SYSCTL
55921+
55922+config GRKERNSEC_SYSCTL
55923+ bool "Sysctl support"
55924+ help
55925+ If you say Y here, you will be able to change the options that
55926+ grsecurity runs with at bootup, without having to recompile your
55927+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
55928+ to enable (1) or disable (0) various features. All the sysctl entries
55929+ are mutable until the "grsec_lock" entry is set to a non-zero value.
55930+ All features enabled in the kernel configuration are disabled at boot
55931+ if you do not say Y to the "Turn on features by default" option.
55932+ All options should be set at startup, and the grsec_lock entry should
55933+ be set to a non-zero value after all the options are set.
55934+ *THIS IS EXTREMELY IMPORTANT*
55935+
55936+config GRKERNSEC_SYSCTL_DISTRO
55937+ bool "Extra sysctl support for distro makers (READ HELP)"
55938+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
55939+ help
55940+ If you say Y here, additional sysctl options will be created
55941+ for features that affect processes running as root. Therefore,
55942+ it is critical when using this option that the grsec_lock entry be
55943+ enabled after boot. Only distros with prebuilt kernel packages
55944+ with this option enabled that can ensure grsec_lock is enabled
55945+ after boot should use this option.
55946+ *Failure to set grsec_lock after boot makes all grsec features
55947+ this option covers useless*
55948+
55949+ Currently this option creates the following sysctl entries:
55950+ "Disable Privileged I/O": "disable_priv_io"
55951+
55952+config GRKERNSEC_SYSCTL_ON
55953+ bool "Turn on features by default"
55954+ depends on GRKERNSEC_SYSCTL
55955+ help
55956+ If you say Y here, instead of having all features enabled in the
55957+ kernel configuration disabled at boot time, the features will be
55958+ enabled at boot time. It is recommended you say Y here unless
55959+ there is some reason you would want all sysctl-tunable features to
55960+ be disabled by default. As mentioned elsewhere, it is important
55961+ to enable the grsec_lock entry once you have finished modifying
55962+ the sysctl entries.
55963+
55964+endmenu
55965+menu "Logging Options"
55966+depends on GRKERNSEC
55967+
55968+config GRKERNSEC_FLOODTIME
55969+ int "Seconds in between log messages (minimum)"
55970+ default 10
55971+ help
55972+ This option allows you to enforce the number of seconds between
55973+ grsecurity log messages. The default should be suitable for most
55974+ people, however, if you choose to change it, choose a value small enough
55975+ to allow informative logs to be produced, but large enough to
55976+ prevent flooding.
55977+
55978+config GRKERNSEC_FLOODBURST
55979+ int "Number of messages in a burst (maximum)"
55980+ default 6
55981+ help
55982+ This option allows you to choose the maximum number of messages allowed
55983+ within the flood time interval you chose in a separate option. The
55984+ default should be suitable for most people, however if you find that
55985+ many of your logs are being interpreted as flooding, you may want to
55986+ raise this value.
55987+
55988+endmenu
55989+
55990+endmenu
55991diff --git a/grsecurity/Makefile b/grsecurity/Makefile
55992new file mode 100644
55993index 0000000..1b9afa9
55994--- /dev/null
55995+++ b/grsecurity/Makefile
55996@@ -0,0 +1,38 @@
55997+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
55998+# during 2001-2009 it has been completely redesigned by Brad Spengler
55999+# into an RBAC system
56000+#
56001+# All code in this directory and various hooks inserted throughout the kernel
56002+# are copyright Brad Spengler - Open Source Security, Inc., and released
56003+# under the GPL v2 or higher
56004+
56005+KBUILD_CFLAGS += -Werror
56006+
56007+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
56008+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
56009+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
56010+
56011+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
56012+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
56013+ gracl_learn.o grsec_log.o
56014+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
56015+
56016+ifdef CONFIG_NET
56017+obj-y += grsec_sock.o
56018+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
56019+endif
56020+
56021+ifndef CONFIG_GRKERNSEC
56022+obj-y += grsec_disabled.o
56023+endif
56024+
56025+ifdef CONFIG_GRKERNSEC_HIDESYM
56026+extra-y := grsec_hidesym.o
56027+$(obj)/grsec_hidesym.o:
56028+ @-chmod -f 500 /boot
56029+ @-chmod -f 500 /lib/modules
56030+ @-chmod -f 500 /lib64/modules
56031+ @-chmod -f 500 /lib32/modules
56032+ @-chmod -f 700 .
56033+ @echo ' grsec: protected kernel image paths'
56034+endif
56035diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
56036new file mode 100644
56037index 0000000..78e83d8
56038--- /dev/null
56039+++ b/grsecurity/gracl.c
56040@@ -0,0 +1,4148 @@
56041+#include <linux/kernel.h>
56042+#include <linux/module.h>
56043+#include <linux/sched.h>
56044+#include <linux/mm.h>
56045+#include <linux/file.h>
56046+#include <linux/fs.h>
56047+#include <linux/namei.h>
56048+#include <linux/mount.h>
56049+#include <linux/tty.h>
56050+#include <linux/proc_fs.h>
56051+#include <linux/smp_lock.h>
56052+#include <linux/slab.h>
56053+#include <linux/vmalloc.h>
56054+#include <linux/types.h>
56055+#include <linux/sysctl.h>
56056+#include <linux/netdevice.h>
56057+#include <linux/ptrace.h>
56058+#include <linux/gracl.h>
56059+#include <linux/gralloc.h>
56060+#include <linux/security.h>
56061+#include <linux/grinternal.h>
56062+#include <linux/pid_namespace.h>
56063+#include <linux/fdtable.h>
56064+#include <linux/percpu.h>
56065+
56066+#include <asm/uaccess.h>
56067+#include <asm/errno.h>
56068+#include <asm/mman.h>
56069+
56070+static struct acl_role_db acl_role_set;
56071+static struct name_db name_set;
56072+static struct inodev_db inodev_set;
56073+
56074+/* for keeping track of userspace pointers used for subjects, so we
56075+ can share references in the kernel as well
56076+*/
56077+
56078+static struct dentry *real_root;
56079+static struct vfsmount *real_root_mnt;
56080+
56081+static struct acl_subj_map_db subj_map_set;
56082+
56083+static struct acl_role_label *default_role;
56084+
56085+static struct acl_role_label *role_list;
56086+
56087+static u16 acl_sp_role_value;
56088+
56089+extern char *gr_shared_page[4];
56090+static DEFINE_MUTEX(gr_dev_mutex);
56091+DEFINE_RWLOCK(gr_inode_lock);
56092+
56093+struct gr_arg *gr_usermode;
56094+
56095+static unsigned int gr_status __read_only = GR_STATUS_INIT;
56096+
56097+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
56098+extern void gr_clear_learn_entries(void);
56099+
56100+#ifdef CONFIG_GRKERNSEC_RESLOG
56101+extern void gr_log_resource(const struct task_struct *task,
56102+ const int res, const unsigned long wanted, const int gt);
56103+#endif
56104+
56105+unsigned char *gr_system_salt;
56106+unsigned char *gr_system_sum;
56107+
56108+static struct sprole_pw **acl_special_roles = NULL;
56109+static __u16 num_sprole_pws = 0;
56110+
56111+static struct acl_role_label *kernel_role = NULL;
56112+
56113+static unsigned int gr_auth_attempts = 0;
56114+static unsigned long gr_auth_expires = 0UL;
56115+
56116+#ifdef CONFIG_NET
56117+extern struct vfsmount *sock_mnt;
56118+#endif
56119+extern struct vfsmount *pipe_mnt;
56120+extern struct vfsmount *shm_mnt;
56121+#ifdef CONFIG_HUGETLBFS
56122+extern struct vfsmount *hugetlbfs_vfsmount;
56123+#endif
56124+
56125+static struct acl_object_label *fakefs_obj_rw;
56126+static struct acl_object_label *fakefs_obj_rwx;
56127+
56128+extern int gr_init_uidset(void);
56129+extern void gr_free_uidset(void);
56130+extern void gr_remove_uid(uid_t uid);
56131+extern int gr_find_uid(uid_t uid);
56132+
56133+__inline__ int
56134+gr_acl_is_enabled(void)
56135+{
56136+ return (gr_status & GR_READY);
56137+}
56138+
56139+#ifdef CONFIG_BTRFS_FS
56140+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
56141+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
56142+#endif
56143+
56144+static inline dev_t __get_dev(const struct dentry *dentry)
56145+{
56146+#ifdef CONFIG_BTRFS_FS
56147+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
56148+ return get_btrfs_dev_from_inode(dentry->d_inode);
56149+ else
56150+#endif
56151+ return dentry->d_inode->i_sb->s_dev;
56152+}
56153+
56154+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
56155+{
56156+ return __get_dev(dentry);
56157+}
56158+
56159+static char gr_task_roletype_to_char(struct task_struct *task)
56160+{
56161+ switch (task->role->roletype &
56162+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
56163+ GR_ROLE_SPECIAL)) {
56164+ case GR_ROLE_DEFAULT:
56165+ return 'D';
56166+ case GR_ROLE_USER:
56167+ return 'U';
56168+ case GR_ROLE_GROUP:
56169+ return 'G';
56170+ case GR_ROLE_SPECIAL:
56171+ return 'S';
56172+ }
56173+
56174+ return 'X';
56175+}
56176+
56177+char gr_roletype_to_char(void)
56178+{
56179+ return gr_task_roletype_to_char(current);
56180+}
56181+
56182+__inline__ int
56183+gr_acl_tpe_check(void)
56184+{
56185+ if (unlikely(!(gr_status & GR_READY)))
56186+ return 0;
56187+ if (current->role->roletype & GR_ROLE_TPE)
56188+ return 1;
56189+ else
56190+ return 0;
56191+}
56192+
56193+int
56194+gr_handle_rawio(const struct inode *inode)
56195+{
56196+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56197+ if (inode && S_ISBLK(inode->i_mode) &&
56198+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
56199+ !capable(CAP_SYS_RAWIO))
56200+ return 1;
56201+#endif
56202+ return 0;
56203+}
56204+
56205+static int
56206+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
56207+{
56208+ if (likely(lena != lenb))
56209+ return 0;
56210+
56211+ return !memcmp(a, b, lena);
56212+}
56213+
56214+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
56215+{
56216+ *buflen -= namelen;
56217+ if (*buflen < 0)
56218+ return -ENAMETOOLONG;
56219+ *buffer -= namelen;
56220+ memcpy(*buffer, str, namelen);
56221+ return 0;
56222+}
56223+
56224+/* this must be called with vfsmount_lock and dcache_lock held */
56225+
56226+static char * __our_d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
56227+ struct dentry *root, struct vfsmount *rootmnt,
56228+ char *buffer, int buflen)
56229+{
56230+ char * end = buffer+buflen;
56231+ char * retval;
56232+ int namelen;
56233+
56234+ *--end = '\0';
56235+ buflen--;
56236+
56237+ if (buflen < 1)
56238+ goto Elong;
56239+ /* Get '/' right */
56240+ retval = end-1;
56241+ *retval = '/';
56242+
56243+ for (;;) {
56244+ struct dentry * parent;
56245+
56246+ if (dentry == root && vfsmnt == rootmnt)
56247+ break;
56248+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
56249+ /* Global root? */
56250+ if (vfsmnt->mnt_parent == vfsmnt)
56251+ goto global_root;
56252+ dentry = vfsmnt->mnt_mountpoint;
56253+ vfsmnt = vfsmnt->mnt_parent;
56254+ continue;
56255+ }
56256+ parent = dentry->d_parent;
56257+ prefetch(parent);
56258+ namelen = dentry->d_name.len;
56259+ buflen -= namelen + 1;
56260+ if (buflen < 0)
56261+ goto Elong;
56262+ end -= namelen;
56263+ memcpy(end, dentry->d_name.name, namelen);
56264+ *--end = '/';
56265+ retval = end;
56266+ dentry = parent;
56267+ }
56268+
56269+out:
56270+ return retval;
56271+
56272+global_root:
56273+ namelen = dentry->d_name.len;
56274+ buflen -= namelen;
56275+ if (buflen < 0)
56276+ goto Elong;
56277+ retval -= namelen-1; /* hit the slash */
56278+ memcpy(retval, dentry->d_name.name, namelen);
56279+ goto out;
56280+Elong:
56281+ retval = ERR_PTR(-ENAMETOOLONG);
56282+ goto out;
56283+}
56284+
56285+static char *
56286+gen_full_path(struct dentry *dentry, struct vfsmount *vfsmnt,
56287+ struct dentry *root, struct vfsmount *rootmnt, char *buf, int buflen)
56288+{
56289+ char *retval;
56290+
56291+ retval = __our_d_path(dentry, vfsmnt, root, rootmnt, buf, buflen);
56292+ if (unlikely(IS_ERR(retval)))
56293+ retval = strcpy(buf, "<path too long>");
56294+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
56295+ retval[1] = '\0';
56296+
56297+ return retval;
56298+}
56299+
56300+static char *
56301+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
56302+ char *buf, int buflen)
56303+{
56304+ char *res;
56305+
56306+ /* we can use real_root, real_root_mnt, because this is only called
56307+ by the RBAC system */
56308+ res = gen_full_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, real_root, real_root_mnt, buf, buflen);
56309+
56310+ return res;
56311+}
56312+
56313+static char *
56314+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
56315+ char *buf, int buflen)
56316+{
56317+ char *res;
56318+ struct dentry *root;
56319+ struct vfsmount *rootmnt;
56320+ struct task_struct *reaper = &init_task;
56321+
56322+ /* we can't use real_root, real_root_mnt, because they belong only to the RBAC system */
56323+ read_lock(&reaper->fs->lock);
56324+ root = dget(reaper->fs->root.dentry);
56325+ rootmnt = mntget(reaper->fs->root.mnt);
56326+ read_unlock(&reaper->fs->lock);
56327+
56328+ spin_lock(&dcache_lock);
56329+ spin_lock(&vfsmount_lock);
56330+ res = gen_full_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, root, rootmnt, buf, buflen);
56331+ spin_unlock(&vfsmount_lock);
56332+ spin_unlock(&dcache_lock);
56333+
56334+ dput(root);
56335+ mntput(rootmnt);
56336+ return res;
56337+}
56338+
56339+static char *
56340+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
56341+{
56342+ char *ret;
56343+ spin_lock(&dcache_lock);
56344+ spin_lock(&vfsmount_lock);
56345+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
56346+ PAGE_SIZE);
56347+ spin_unlock(&vfsmount_lock);
56348+ spin_unlock(&dcache_lock);
56349+ return ret;
56350+}
56351+
56352+static char *
56353+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
56354+{
56355+ char *ret;
56356+ char *buf;
56357+ int buflen;
56358+
56359+ spin_lock(&dcache_lock);
56360+ spin_lock(&vfsmount_lock);
56361+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
56362+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
56363+ buflen = (int)(ret - buf);
56364+ if (buflen >= 5)
56365+ prepend(&ret, &buflen, "/proc", 5);
56366+ else
56367+ ret = strcpy(buf, "<path too long>");
56368+ spin_unlock(&vfsmount_lock);
56369+ spin_unlock(&dcache_lock);
56370+ return ret;
56371+}
56372+
56373+char *
56374+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
56375+{
56376+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
56377+ PAGE_SIZE);
56378+}
56379+
56380+char *
56381+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
56382+{
56383+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
56384+ PAGE_SIZE);
56385+}
56386+
56387+char *
56388+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
56389+{
56390+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
56391+ PAGE_SIZE);
56392+}
56393+
56394+char *
56395+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
56396+{
56397+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
56398+ PAGE_SIZE);
56399+}
56400+
56401+char *
56402+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
56403+{
56404+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
56405+ PAGE_SIZE);
56406+}
56407+
56408+__inline__ __u32
56409+to_gr_audit(const __u32 reqmode)
56410+{
56411+ /* masks off auditable permission flags, then shifts them to create
56412+ auditing flags, and adds the special case of append auditing if
56413+ we're requesting write */
56414+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
56415+}
56416+
56417+struct acl_subject_label *
56418+lookup_subject_map(const struct acl_subject_label *userp)
56419+{
56420+ unsigned int index = shash(userp, subj_map_set.s_size);
56421+ struct subject_map *match;
56422+
56423+ match = subj_map_set.s_hash[index];
56424+
56425+ while (match && match->user != userp)
56426+ match = match->next;
56427+
56428+ if (match != NULL)
56429+ return match->kernel;
56430+ else
56431+ return NULL;
56432+}
56433+
56434+static void
56435+insert_subj_map_entry(struct subject_map *subjmap)
56436+{
56437+ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
56438+ struct subject_map **curr;
56439+
56440+ subjmap->prev = NULL;
56441+
56442+ curr = &subj_map_set.s_hash[index];
56443+ if (*curr != NULL)
56444+ (*curr)->prev = subjmap;
56445+
56446+ subjmap->next = *curr;
56447+ *curr = subjmap;
56448+
56449+ return;
56450+}
56451+
56452+static struct acl_role_label *
56453+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
56454+ const gid_t gid)
56455+{
56456+ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
56457+ struct acl_role_label *match;
56458+ struct role_allowed_ip *ipp;
56459+ unsigned int x;
56460+ u32 curr_ip = task->signal->curr_ip;
56461+
56462+ task->signal->saved_ip = curr_ip;
56463+
56464+ match = acl_role_set.r_hash[index];
56465+
56466+ while (match) {
56467+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
56468+ for (x = 0; x < match->domain_child_num; x++) {
56469+ if (match->domain_children[x] == uid)
56470+ goto found;
56471+ }
56472+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
56473+ break;
56474+ match = match->next;
56475+ }
56476+found:
56477+ if (match == NULL) {
56478+ try_group:
56479+ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
56480+ match = acl_role_set.r_hash[index];
56481+
56482+ while (match) {
56483+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
56484+ for (x = 0; x < match->domain_child_num; x++) {
56485+ if (match->domain_children[x] == gid)
56486+ goto found2;
56487+ }
56488+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
56489+ break;
56490+ match = match->next;
56491+ }
56492+found2:
56493+ if (match == NULL)
56494+ match = default_role;
56495+ if (match->allowed_ips == NULL)
56496+ return match;
56497+ else {
56498+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
56499+ if (likely
56500+ ((ntohl(curr_ip) & ipp->netmask) ==
56501+ (ntohl(ipp->addr) & ipp->netmask)))
56502+ return match;
56503+ }
56504+ match = default_role;
56505+ }
56506+ } else if (match->allowed_ips == NULL) {
56507+ return match;
56508+ } else {
56509+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
56510+ if (likely
56511+ ((ntohl(curr_ip) & ipp->netmask) ==
56512+ (ntohl(ipp->addr) & ipp->netmask)))
56513+ return match;
56514+ }
56515+ goto try_group;
56516+ }
56517+
56518+ return match;
56519+}
56520+
56521+struct acl_subject_label *
56522+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
56523+ const struct acl_role_label *role)
56524+{
56525+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
56526+ struct acl_subject_label *match;
56527+
56528+ match = role->subj_hash[index];
56529+
56530+ while (match && (match->inode != ino || match->device != dev ||
56531+ (match->mode & GR_DELETED))) {
56532+ match = match->next;
56533+ }
56534+
56535+ if (match && !(match->mode & GR_DELETED))
56536+ return match;
56537+ else
56538+ return NULL;
56539+}
56540+
56541+struct acl_subject_label *
56542+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
56543+ const struct acl_role_label *role)
56544+{
56545+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
56546+ struct acl_subject_label *match;
56547+
56548+ match = role->subj_hash[index];
56549+
56550+ while (match && (match->inode != ino || match->device != dev ||
56551+ !(match->mode & GR_DELETED))) {
56552+ match = match->next;
56553+ }
56554+
56555+ if (match && (match->mode & GR_DELETED))
56556+ return match;
56557+ else
56558+ return NULL;
56559+}
56560+
56561+static struct acl_object_label *
56562+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
56563+ const struct acl_subject_label *subj)
56564+{
56565+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
56566+ struct acl_object_label *match;
56567+
56568+ match = subj->obj_hash[index];
56569+
56570+ while (match && (match->inode != ino || match->device != dev ||
56571+ (match->mode & GR_DELETED))) {
56572+ match = match->next;
56573+ }
56574+
56575+ if (match && !(match->mode & GR_DELETED))
56576+ return match;
56577+ else
56578+ return NULL;
56579+}
56580+
56581+static struct acl_object_label *
56582+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
56583+ const struct acl_subject_label *subj)
56584+{
56585+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
56586+ struct acl_object_label *match;
56587+
56588+ match = subj->obj_hash[index];
56589+
56590+ while (match && (match->inode != ino || match->device != dev ||
56591+ !(match->mode & GR_DELETED))) {
56592+ match = match->next;
56593+ }
56594+
56595+ if (match && (match->mode & GR_DELETED))
56596+ return match;
56597+
56598+ match = subj->obj_hash[index];
56599+
56600+ while (match && (match->inode != ino || match->device != dev ||
56601+ (match->mode & GR_DELETED))) {
56602+ match = match->next;
56603+ }
56604+
56605+ if (match && !(match->mode & GR_DELETED))
56606+ return match;
56607+ else
56608+ return NULL;
56609+}
56610+
56611+static struct name_entry *
56612+lookup_name_entry(const char *name)
56613+{
56614+ unsigned int len = strlen(name);
56615+ unsigned int key = full_name_hash(name, len);
56616+ unsigned int index = key % name_set.n_size;
56617+ struct name_entry *match;
56618+
56619+ match = name_set.n_hash[index];
56620+
56621+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
56622+ match = match->next;
56623+
56624+ return match;
56625+}
56626+
56627+static struct name_entry *
56628+lookup_name_entry_create(const char *name)
56629+{
56630+ unsigned int len = strlen(name);
56631+ unsigned int key = full_name_hash(name, len);
56632+ unsigned int index = key % name_set.n_size;
56633+ struct name_entry *match;
56634+
56635+ match = name_set.n_hash[index];
56636+
56637+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
56638+ !match->deleted))
56639+ match = match->next;
56640+
56641+ if (match && match->deleted)
56642+ return match;
56643+
56644+ match = name_set.n_hash[index];
56645+
56646+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
56647+ match->deleted))
56648+ match = match->next;
56649+
56650+ if (match && !match->deleted)
56651+ return match;
56652+ else
56653+ return NULL;
56654+}
56655+
56656+static struct inodev_entry *
56657+lookup_inodev_entry(const ino_t ino, const dev_t dev)
56658+{
56659+ unsigned int index = fhash(ino, dev, inodev_set.i_size);
56660+ struct inodev_entry *match;
56661+
56662+ match = inodev_set.i_hash[index];
56663+
56664+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
56665+ match = match->next;
56666+
56667+ return match;
56668+}
56669+
56670+static void
56671+insert_inodev_entry(struct inodev_entry *entry)
56672+{
56673+ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
56674+ inodev_set.i_size);
56675+ struct inodev_entry **curr;
56676+
56677+ entry->prev = NULL;
56678+
56679+ curr = &inodev_set.i_hash[index];
56680+ if (*curr != NULL)
56681+ (*curr)->prev = entry;
56682+
56683+ entry->next = *curr;
56684+ *curr = entry;
56685+
56686+ return;
56687+}
56688+
56689+static void
56690+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
56691+{
56692+ unsigned int index =
56693+ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
56694+ struct acl_role_label **curr;
56695+ struct acl_role_label *tmp;
56696+
56697+ curr = &acl_role_set.r_hash[index];
56698+
56699+ /* if role was already inserted due to domains and already has
56700+ a role in the same bucket as it attached, then we need to
56701+ combine these two buckets
56702+ */
56703+ if (role->next) {
56704+ tmp = role->next;
56705+ while (tmp->next)
56706+ tmp = tmp->next;
56707+ tmp->next = *curr;
56708+ } else
56709+ role->next = *curr;
56710+ *curr = role;
56711+
56712+ return;
56713+}
56714+
56715+static void
56716+insert_acl_role_label(struct acl_role_label *role)
56717+{
56718+ int i;
56719+
56720+ if (role_list == NULL) {
56721+ role_list = role;
56722+ role->prev = NULL;
56723+ } else {
56724+ role->prev = role_list;
56725+ role_list = role;
56726+ }
56727+
56728+ /* used for hash chains */
56729+ role->next = NULL;
56730+
56731+ if (role->roletype & GR_ROLE_DOMAIN) {
56732+ for (i = 0; i < role->domain_child_num; i++)
56733+ __insert_acl_role_label(role, role->domain_children[i]);
56734+ } else
56735+ __insert_acl_role_label(role, role->uidgid);
56736+}
56737+
56738+static int
56739+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
56740+{
56741+ struct name_entry **curr, *nentry;
56742+ struct inodev_entry *ientry;
56743+ unsigned int len = strlen(name);
56744+ unsigned int key = full_name_hash(name, len);
56745+ unsigned int index = key % name_set.n_size;
56746+
56747+ curr = &name_set.n_hash[index];
56748+
56749+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
56750+ curr = &((*curr)->next);
56751+
56752+ if (*curr != NULL)
56753+ return 1;
56754+
56755+ nentry = acl_alloc(sizeof (struct name_entry));
56756+ if (nentry == NULL)
56757+ return 0;
56758+ ientry = acl_alloc(sizeof (struct inodev_entry));
56759+ if (ientry == NULL)
56760+ return 0;
56761+ ientry->nentry = nentry;
56762+
56763+ nentry->key = key;
56764+ nentry->name = name;
56765+ nentry->inode = inode;
56766+ nentry->device = device;
56767+ nentry->len = len;
56768+ nentry->deleted = deleted;
56769+
56770+ nentry->prev = NULL;
56771+ curr = &name_set.n_hash[index];
56772+ if (*curr != NULL)
56773+ (*curr)->prev = nentry;
56774+ nentry->next = *curr;
56775+ *curr = nentry;
56776+
56777+ /* insert us into the table searchable by inode/dev */
56778+ insert_inodev_entry(ientry);
56779+
56780+ return 1;
56781+}
56782+
56783+static void
56784+insert_acl_obj_label(struct acl_object_label *obj,
56785+ struct acl_subject_label *subj)
56786+{
56787+ unsigned int index =
56788+ fhash(obj->inode, obj->device, subj->obj_hash_size);
56789+ struct acl_object_label **curr;
56790+
56791+
56792+ obj->prev = NULL;
56793+
56794+ curr = &subj->obj_hash[index];
56795+ if (*curr != NULL)
56796+ (*curr)->prev = obj;
56797+
56798+ obj->next = *curr;
56799+ *curr = obj;
56800+
56801+ return;
56802+}
56803+
56804+static void
56805+insert_acl_subj_label(struct acl_subject_label *obj,
56806+ struct acl_role_label *role)
56807+{
56808+ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
56809+ struct acl_subject_label **curr;
56810+
56811+ obj->prev = NULL;
56812+
56813+ curr = &role->subj_hash[index];
56814+ if (*curr != NULL)
56815+ (*curr)->prev = obj;
56816+
56817+ obj->next = *curr;
56818+ *curr = obj;
56819+
56820+ return;
56821+}
56822+
56823+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
56824+
56825+static void *
56826+create_table(__u32 * len, int elementsize)
56827+{
56828+ unsigned int table_sizes[] = {
56829+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
56830+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
56831+ 4194301, 8388593, 16777213, 33554393, 67108859
56832+ };
56833+ void *newtable = NULL;
56834+ unsigned int pwr = 0;
56835+
56836+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
56837+ table_sizes[pwr] <= *len)
56838+ pwr++;
56839+
56840+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
56841+ return newtable;
56842+
56843+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
56844+ newtable =
56845+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
56846+ else
56847+ newtable = vmalloc(table_sizes[pwr] * elementsize);
56848+
56849+ *len = table_sizes[pwr];
56850+
56851+ return newtable;
56852+}
56853+
56854+static int
56855+init_variables(const struct gr_arg *arg)
56856+{
56857+ struct task_struct *reaper = &init_task;
56858+ unsigned int stacksize;
56859+
56860+ subj_map_set.s_size = arg->role_db.num_subjects;
56861+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
56862+ name_set.n_size = arg->role_db.num_objects;
56863+ inodev_set.i_size = arg->role_db.num_objects;
56864+
56865+ if (!subj_map_set.s_size || !acl_role_set.r_size ||
56866+ !name_set.n_size || !inodev_set.i_size)
56867+ return 1;
56868+
56869+ if (!gr_init_uidset())
56870+ return 1;
56871+
56872+ /* set up the stack that holds allocation info */
56873+
56874+ stacksize = arg->role_db.num_pointers + 5;
56875+
56876+ if (!acl_alloc_stack_init(stacksize))
56877+ return 1;
56878+
56879+ /* grab reference for the real root dentry and vfsmount */
56880+ read_lock(&reaper->fs->lock);
56881+ real_root = dget(reaper->fs->root.dentry);
56882+ real_root_mnt = mntget(reaper->fs->root.mnt);
56883+ read_unlock(&reaper->fs->lock);
56884+
56885+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
56886+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root), real_root->d_inode->i_ino);
56887+#endif
56888+
56889+ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
56890+ if (fakefs_obj_rw == NULL)
56891+ return 1;
56892+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
56893+
56894+ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
56895+ if (fakefs_obj_rwx == NULL)
56896+ return 1;
56897+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
56898+
56899+ subj_map_set.s_hash =
56900+ (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
56901+ acl_role_set.r_hash =
56902+ (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
56903+ name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
56904+ inodev_set.i_hash =
56905+ (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
56906+
56907+ if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
56908+ !name_set.n_hash || !inodev_set.i_hash)
56909+ return 1;
56910+
56911+ memset(subj_map_set.s_hash, 0,
56912+ sizeof(struct subject_map *) * subj_map_set.s_size);
56913+ memset(acl_role_set.r_hash, 0,
56914+ sizeof (struct acl_role_label *) * acl_role_set.r_size);
56915+ memset(name_set.n_hash, 0,
56916+ sizeof (struct name_entry *) * name_set.n_size);
56917+ memset(inodev_set.i_hash, 0,
56918+ sizeof (struct inodev_entry *) * inodev_set.i_size);
56919+
56920+ return 0;
56921+}
56922+
56923+/* free information not needed after startup
56924+ currently contains user->kernel pointer mappings for subjects
56925+*/
56926+
56927+static void
56928+free_init_variables(void)
56929+{
56930+ __u32 i;
56931+
56932+ if (subj_map_set.s_hash) {
56933+ for (i = 0; i < subj_map_set.s_size; i++) {
56934+ if (subj_map_set.s_hash[i]) {
56935+ kfree(subj_map_set.s_hash[i]);
56936+ subj_map_set.s_hash[i] = NULL;
56937+ }
56938+ }
56939+
56940+ if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
56941+ PAGE_SIZE)
56942+ kfree(subj_map_set.s_hash);
56943+ else
56944+ vfree(subj_map_set.s_hash);
56945+ }
56946+
56947+ return;
56948+}
56949+
56950+static void
56951+free_variables(void)
56952+{
56953+ struct acl_subject_label *s;
56954+ struct acl_role_label *r;
56955+ struct task_struct *task, *task2;
56956+ unsigned int x;
56957+
56958+ gr_clear_learn_entries();
56959+
56960+ read_lock(&tasklist_lock);
56961+ do_each_thread(task2, task) {
56962+ task->acl_sp_role = 0;
56963+ task->acl_role_id = 0;
56964+ task->acl = NULL;
56965+ task->role = NULL;
56966+ } while_each_thread(task2, task);
56967+ read_unlock(&tasklist_lock);
56968+
56969+ /* release the reference to the real root dentry and vfsmount */
56970+ if (real_root)
56971+ dput(real_root);
56972+ real_root = NULL;
56973+ if (real_root_mnt)
56974+ mntput(real_root_mnt);
56975+ real_root_mnt = NULL;
56976+
56977+ /* free all object hash tables */
56978+
56979+ FOR_EACH_ROLE_START(r)
56980+ if (r->subj_hash == NULL)
56981+ goto next_role;
56982+ FOR_EACH_SUBJECT_START(r, s, x)
56983+ if (s->obj_hash == NULL)
56984+ break;
56985+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
56986+ kfree(s->obj_hash);
56987+ else
56988+ vfree(s->obj_hash);
56989+ FOR_EACH_SUBJECT_END(s, x)
56990+ FOR_EACH_NESTED_SUBJECT_START(r, s)
56991+ if (s->obj_hash == NULL)
56992+ break;
56993+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
56994+ kfree(s->obj_hash);
56995+ else
56996+ vfree(s->obj_hash);
56997+ FOR_EACH_NESTED_SUBJECT_END(s)
56998+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
56999+ kfree(r->subj_hash);
57000+ else
57001+ vfree(r->subj_hash);
57002+ r->subj_hash = NULL;
57003+next_role:
57004+ FOR_EACH_ROLE_END(r)
57005+
57006+ acl_free_all();
57007+
57008+ if (acl_role_set.r_hash) {
57009+ if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
57010+ PAGE_SIZE)
57011+ kfree(acl_role_set.r_hash);
57012+ else
57013+ vfree(acl_role_set.r_hash);
57014+ }
57015+ if (name_set.n_hash) {
57016+ if ((name_set.n_size * sizeof (struct name_entry *)) <=
57017+ PAGE_SIZE)
57018+ kfree(name_set.n_hash);
57019+ else
57020+ vfree(name_set.n_hash);
57021+ }
57022+
57023+ if (inodev_set.i_hash) {
57024+ if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
57025+ PAGE_SIZE)
57026+ kfree(inodev_set.i_hash);
57027+ else
57028+ vfree(inodev_set.i_hash);
57029+ }
57030+
57031+ gr_free_uidset();
57032+
57033+ memset(&name_set, 0, sizeof (struct name_db));
57034+ memset(&inodev_set, 0, sizeof (struct inodev_db));
57035+ memset(&acl_role_set, 0, sizeof (struct acl_role_db));
57036+ memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
57037+
57038+ default_role = NULL;
57039+ role_list = NULL;
57040+
57041+ return;
57042+}
57043+
57044+static __u32
57045+count_user_objs(struct acl_object_label *userp)
57046+{
57047+ struct acl_object_label o_tmp;
57048+ __u32 num = 0;
57049+
57050+ while (userp) {
57051+ if (copy_from_user(&o_tmp, userp,
57052+ sizeof (struct acl_object_label)))
57053+ break;
57054+
57055+ userp = o_tmp.prev;
57056+ num++;
57057+ }
57058+
57059+ return num;
57060+}
57061+
57062+static struct acl_subject_label *
57063+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
57064+
57065+static int
57066+copy_user_glob(struct acl_object_label *obj)
57067+{
57068+ struct acl_object_label *g_tmp, **guser;
57069+ unsigned int len;
57070+ char *tmp;
57071+
57072+ if (obj->globbed == NULL)
57073+ return 0;
57074+
57075+ guser = &obj->globbed;
57076+ while (*guser) {
57077+ g_tmp = (struct acl_object_label *)
57078+ acl_alloc(sizeof (struct acl_object_label));
57079+ if (g_tmp == NULL)
57080+ return -ENOMEM;
57081+
57082+ if (copy_from_user(g_tmp, *guser,
57083+ sizeof (struct acl_object_label)))
57084+ return -EFAULT;
57085+
57086+ len = strnlen_user(g_tmp->filename, PATH_MAX);
57087+
57088+ if (!len || len >= PATH_MAX)
57089+ return -EINVAL;
57090+
57091+ if ((tmp = (char *) acl_alloc(len)) == NULL)
57092+ return -ENOMEM;
57093+
57094+ if (copy_from_user(tmp, g_tmp->filename, len))
57095+ return -EFAULT;
57096+ tmp[len-1] = '\0';
57097+ g_tmp->filename = tmp;
57098+
57099+ *guser = g_tmp;
57100+ guser = &(g_tmp->next);
57101+ }
57102+
57103+ return 0;
57104+}
57105+
57106+static int
57107+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
57108+ struct acl_role_label *role)
57109+{
57110+ struct acl_object_label *o_tmp;
57111+ unsigned int len;
57112+ int ret;
57113+ char *tmp;
57114+
57115+ while (userp) {
57116+ if ((o_tmp = (struct acl_object_label *)
57117+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
57118+ return -ENOMEM;
57119+
57120+ if (copy_from_user(o_tmp, userp,
57121+ sizeof (struct acl_object_label)))
57122+ return -EFAULT;
57123+
57124+ userp = o_tmp->prev;
57125+
57126+ len = strnlen_user(o_tmp->filename, PATH_MAX);
57127+
57128+ if (!len || len >= PATH_MAX)
57129+ return -EINVAL;
57130+
57131+ if ((tmp = (char *) acl_alloc(len)) == NULL)
57132+ return -ENOMEM;
57133+
57134+ if (copy_from_user(tmp, o_tmp->filename, len))
57135+ return -EFAULT;
57136+ tmp[len-1] = '\0';
57137+ o_tmp->filename = tmp;
57138+
57139+ insert_acl_obj_label(o_tmp, subj);
57140+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
57141+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
57142+ return -ENOMEM;
57143+
57144+ ret = copy_user_glob(o_tmp);
57145+ if (ret)
57146+ return ret;
57147+
57148+ if (o_tmp->nested) {
57149+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
57150+ if (IS_ERR(o_tmp->nested))
57151+ return PTR_ERR(o_tmp->nested);
57152+
57153+ /* insert into nested subject list */
57154+ o_tmp->nested->next = role->hash->first;
57155+ role->hash->first = o_tmp->nested;
57156+ }
57157+ }
57158+
57159+ return 0;
57160+}
57161+
57162+static __u32
57163+count_user_subjs(struct acl_subject_label *userp)
57164+{
57165+ struct acl_subject_label s_tmp;
57166+ __u32 num = 0;
57167+
57168+ while (userp) {
57169+ if (copy_from_user(&s_tmp, userp,
57170+ sizeof (struct acl_subject_label)))
57171+ break;
57172+
57173+ userp = s_tmp.prev;
57174+ /* do not count nested subjects against this count, since
57175+ they are not included in the hash table, but are
57176+ attached to objects. We have already counted
57177+ the subjects in userspace for the allocation
57178+ stack
57179+ */
57180+ if (!(s_tmp.mode & GR_NESTED))
57181+ num++;
57182+ }
57183+
57184+ return num;
57185+}
57186+
57187+static int
57188+copy_user_allowedips(struct acl_role_label *rolep)
57189+{
57190+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
57191+
57192+ ruserip = rolep->allowed_ips;
57193+
57194+ while (ruserip) {
57195+ rlast = rtmp;
57196+
57197+ if ((rtmp = (struct role_allowed_ip *)
57198+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
57199+ return -ENOMEM;
57200+
57201+ if (copy_from_user(rtmp, ruserip,
57202+ sizeof (struct role_allowed_ip)))
57203+ return -EFAULT;
57204+
57205+ ruserip = rtmp->prev;
57206+
57207+ if (!rlast) {
57208+ rtmp->prev = NULL;
57209+ rolep->allowed_ips = rtmp;
57210+ } else {
57211+ rlast->next = rtmp;
57212+ rtmp->prev = rlast;
57213+ }
57214+
57215+ if (!ruserip)
57216+ rtmp->next = NULL;
57217+ }
57218+
57219+ return 0;
57220+}
57221+
57222+static int
57223+copy_user_transitions(struct acl_role_label *rolep)
57224+{
57225+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
57226+
57227+ unsigned int len;
57228+ char *tmp;
57229+
57230+ rusertp = rolep->transitions;
57231+
57232+ while (rusertp) {
57233+ rlast = rtmp;
57234+
57235+ if ((rtmp = (struct role_transition *)
57236+ acl_alloc(sizeof (struct role_transition))) == NULL)
57237+ return -ENOMEM;
57238+
57239+ if (copy_from_user(rtmp, rusertp,
57240+ sizeof (struct role_transition)))
57241+ return -EFAULT;
57242+
57243+ rusertp = rtmp->prev;
57244+
57245+ len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
57246+
57247+ if (!len || len >= GR_SPROLE_LEN)
57248+ return -EINVAL;
57249+
57250+ if ((tmp = (char *) acl_alloc(len)) == NULL)
57251+ return -ENOMEM;
57252+
57253+ if (copy_from_user(tmp, rtmp->rolename, len))
57254+ return -EFAULT;
57255+ tmp[len-1] = '\0';
57256+ rtmp->rolename = tmp;
57257+
57258+ if (!rlast) {
57259+ rtmp->prev = NULL;
57260+ rolep->transitions = rtmp;
57261+ } else {
57262+ rlast->next = rtmp;
57263+ rtmp->prev = rlast;
57264+ }
57265+
57266+ if (!rusertp)
57267+ rtmp->next = NULL;
57268+ }
57269+
57270+ return 0;
57271+}
57272+
57273+static struct acl_subject_label *
57274+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
57275+{
57276+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
57277+ unsigned int len;
57278+ char *tmp;
57279+ __u32 num_objs;
57280+ struct acl_ip_label **i_tmp, *i_utmp2;
57281+ struct gr_hash_struct ghash;
57282+ struct subject_map *subjmap;
57283+ unsigned int i_num;
57284+ int err;
57285+
57286+ s_tmp = lookup_subject_map(userp);
57287+
57288+ /* we've already copied this subject into the kernel, just return
57289+ the reference to it, and don't copy it over again
57290+ */
57291+ if (s_tmp)
57292+ return(s_tmp);
57293+
57294+ if ((s_tmp = (struct acl_subject_label *)
57295+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
57296+ return ERR_PTR(-ENOMEM);
57297+
57298+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
57299+ if (subjmap == NULL)
57300+ return ERR_PTR(-ENOMEM);
57301+
57302+ subjmap->user = userp;
57303+ subjmap->kernel = s_tmp;
57304+ insert_subj_map_entry(subjmap);
57305+
57306+ if (copy_from_user(s_tmp, userp,
57307+ sizeof (struct acl_subject_label)))
57308+ return ERR_PTR(-EFAULT);
57309+
57310+ len = strnlen_user(s_tmp->filename, PATH_MAX);
57311+
57312+ if (!len || len >= PATH_MAX)
57313+ return ERR_PTR(-EINVAL);
57314+
57315+ if ((tmp = (char *) acl_alloc(len)) == NULL)
57316+ return ERR_PTR(-ENOMEM);
57317+
57318+ if (copy_from_user(tmp, s_tmp->filename, len))
57319+ return ERR_PTR(-EFAULT);
57320+ tmp[len-1] = '\0';
57321+ s_tmp->filename = tmp;
57322+
57323+ if (!strcmp(s_tmp->filename, "/"))
57324+ role->root_label = s_tmp;
57325+
57326+ if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
57327+ return ERR_PTR(-EFAULT);
57328+
57329+ /* copy user and group transition tables */
57330+
57331+ if (s_tmp->user_trans_num) {
57332+ uid_t *uidlist;
57333+
57334+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
57335+ if (uidlist == NULL)
57336+ return ERR_PTR(-ENOMEM);
57337+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
57338+ return ERR_PTR(-EFAULT);
57339+
57340+ s_tmp->user_transitions = uidlist;
57341+ }
57342+
57343+ if (s_tmp->group_trans_num) {
57344+ gid_t *gidlist;
57345+
57346+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
57347+ if (gidlist == NULL)
57348+ return ERR_PTR(-ENOMEM);
57349+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
57350+ return ERR_PTR(-EFAULT);
57351+
57352+ s_tmp->group_transitions = gidlist;
57353+ }
57354+
57355+ /* set up object hash table */
57356+ num_objs = count_user_objs(ghash.first);
57357+
57358+ s_tmp->obj_hash_size = num_objs;
57359+ s_tmp->obj_hash =
57360+ (struct acl_object_label **)
57361+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
57362+
57363+ if (!s_tmp->obj_hash)
57364+ return ERR_PTR(-ENOMEM);
57365+
57366+ memset(s_tmp->obj_hash, 0,
57367+ s_tmp->obj_hash_size *
57368+ sizeof (struct acl_object_label *));
57369+
57370+ /* add in objects */
57371+ err = copy_user_objs(ghash.first, s_tmp, role);
57372+
57373+ if (err)
57374+ return ERR_PTR(err);
57375+
57376+ /* set pointer for parent subject */
57377+ if (s_tmp->parent_subject) {
57378+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
57379+
57380+ if (IS_ERR(s_tmp2))
57381+ return s_tmp2;
57382+
57383+ s_tmp->parent_subject = s_tmp2;
57384+ }
57385+
57386+ /* add in ip acls */
57387+
57388+ if (!s_tmp->ip_num) {
57389+ s_tmp->ips = NULL;
57390+ goto insert;
57391+ }
57392+
57393+ i_tmp =
57394+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
57395+ sizeof (struct acl_ip_label *));
57396+
57397+ if (!i_tmp)
57398+ return ERR_PTR(-ENOMEM);
57399+
57400+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
57401+ *(i_tmp + i_num) =
57402+ (struct acl_ip_label *)
57403+ acl_alloc(sizeof (struct acl_ip_label));
57404+ if (!*(i_tmp + i_num))
57405+ return ERR_PTR(-ENOMEM);
57406+
57407+ if (copy_from_user
57408+ (&i_utmp2, s_tmp->ips + i_num,
57409+ sizeof (struct acl_ip_label *)))
57410+ return ERR_PTR(-EFAULT);
57411+
57412+ if (copy_from_user
57413+ (*(i_tmp + i_num), i_utmp2,
57414+ sizeof (struct acl_ip_label)))
57415+ return ERR_PTR(-EFAULT);
57416+
57417+ if ((*(i_tmp + i_num))->iface == NULL)
57418+ continue;
57419+
57420+ len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
57421+ if (!len || len >= IFNAMSIZ)
57422+ return ERR_PTR(-EINVAL);
57423+ tmp = acl_alloc(len);
57424+ if (tmp == NULL)
57425+ return ERR_PTR(-ENOMEM);
57426+ if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
57427+ return ERR_PTR(-EFAULT);
57428+ (*(i_tmp + i_num))->iface = tmp;
57429+ }
57430+
57431+ s_tmp->ips = i_tmp;
57432+
57433+insert:
57434+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
57435+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
57436+ return ERR_PTR(-ENOMEM);
57437+
57438+ return s_tmp;
57439+}
57440+
57441+static int
57442+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
57443+{
57444+ struct acl_subject_label s_pre;
57445+ struct acl_subject_label * ret;
57446+ int err;
57447+
57448+ while (userp) {
57449+ if (copy_from_user(&s_pre, userp,
57450+ sizeof (struct acl_subject_label)))
57451+ return -EFAULT;
57452+
57453+ /* do not add nested subjects here, add
57454+ while parsing objects
57455+ */
57456+
57457+ if (s_pre.mode & GR_NESTED) {
57458+ userp = s_pre.prev;
57459+ continue;
57460+ }
57461+
57462+ ret = do_copy_user_subj(userp, role);
57463+
57464+ err = PTR_ERR(ret);
57465+ if (IS_ERR(ret))
57466+ return err;
57467+
57468+ insert_acl_subj_label(ret, role);
57469+
57470+ userp = s_pre.prev;
57471+ }
57472+
57473+ return 0;
57474+}
57475+
57476+static int
57477+copy_user_acl(struct gr_arg *arg)
57478+{
57479+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
57480+ struct sprole_pw *sptmp;
57481+ struct gr_hash_struct *ghash;
57482+ uid_t *domainlist;
57483+ unsigned int r_num;
57484+ unsigned int len;
57485+ char *tmp;
57486+ int err = 0;
57487+ __u16 i;
57488+ __u32 num_subjs;
57489+
57490+ /* we need a default and kernel role */
57491+ if (arg->role_db.num_roles < 2)
57492+ return -EINVAL;
57493+
57494+ /* copy special role authentication info from userspace */
57495+
57496+ num_sprole_pws = arg->num_sprole_pws;
57497+ acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
57498+
57499+ if (!acl_special_roles) {
57500+ err = -ENOMEM;
57501+ goto cleanup;
57502+ }
57503+
57504+ for (i = 0; i < num_sprole_pws; i++) {
57505+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
57506+ if (!sptmp) {
57507+ err = -ENOMEM;
57508+ goto cleanup;
57509+ }
57510+ if (copy_from_user(sptmp, arg->sprole_pws + i,
57511+ sizeof (struct sprole_pw))) {
57512+ err = -EFAULT;
57513+ goto cleanup;
57514+ }
57515+
57516+ len =
57517+ strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
57518+
57519+ if (!len || len >= GR_SPROLE_LEN) {
57520+ err = -EINVAL;
57521+ goto cleanup;
57522+ }
57523+
57524+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
57525+ err = -ENOMEM;
57526+ goto cleanup;
57527+ }
57528+
57529+ if (copy_from_user(tmp, sptmp->rolename, len)) {
57530+ err = -EFAULT;
57531+ goto cleanup;
57532+ }
57533+ tmp[len-1] = '\0';
57534+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
57535+ printk(KERN_ALERT "Copying special role %s\n", tmp);
57536+#endif
57537+ sptmp->rolename = tmp;
57538+ acl_special_roles[i] = sptmp;
57539+ }
57540+
57541+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
57542+
57543+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
57544+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
57545+
57546+ if (!r_tmp) {
57547+ err = -ENOMEM;
57548+ goto cleanup;
57549+ }
57550+
57551+ if (copy_from_user(&r_utmp2, r_utmp + r_num,
57552+ sizeof (struct acl_role_label *))) {
57553+ err = -EFAULT;
57554+ goto cleanup;
57555+ }
57556+
57557+ if (copy_from_user(r_tmp, r_utmp2,
57558+ sizeof (struct acl_role_label))) {
57559+ err = -EFAULT;
57560+ goto cleanup;
57561+ }
57562+
57563+ len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
57564+
57565+ if (!len || len >= PATH_MAX) {
57566+ err = -EINVAL;
57567+ goto cleanup;
57568+ }
57569+
57570+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
57571+ err = -ENOMEM;
57572+ goto cleanup;
57573+ }
57574+ if (copy_from_user(tmp, r_tmp->rolename, len)) {
57575+ err = -EFAULT;
57576+ goto cleanup;
57577+ }
57578+ tmp[len-1] = '\0';
57579+ r_tmp->rolename = tmp;
57580+
57581+ if (!strcmp(r_tmp->rolename, "default")
57582+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
57583+ default_role = r_tmp;
57584+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
57585+ kernel_role = r_tmp;
57586+ }
57587+
57588+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) {
57589+ err = -ENOMEM;
57590+ goto cleanup;
57591+ }
57592+ if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct))) {
57593+ err = -EFAULT;
57594+ goto cleanup;
57595+ }
57596+
57597+ r_tmp->hash = ghash;
57598+
57599+ num_subjs = count_user_subjs(r_tmp->hash->first);
57600+
57601+ r_tmp->subj_hash_size = num_subjs;
57602+ r_tmp->subj_hash =
57603+ (struct acl_subject_label **)
57604+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
57605+
57606+ if (!r_tmp->subj_hash) {
57607+ err = -ENOMEM;
57608+ goto cleanup;
57609+ }
57610+
57611+ err = copy_user_allowedips(r_tmp);
57612+ if (err)
57613+ goto cleanup;
57614+
57615+ /* copy domain info */
57616+ if (r_tmp->domain_children != NULL) {
57617+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
57618+ if (domainlist == NULL) {
57619+ err = -ENOMEM;
57620+ goto cleanup;
57621+ }
57622+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t))) {
57623+ err = -EFAULT;
57624+ goto cleanup;
57625+ }
57626+ r_tmp->domain_children = domainlist;
57627+ }
57628+
57629+ err = copy_user_transitions(r_tmp);
57630+ if (err)
57631+ goto cleanup;
57632+
57633+ memset(r_tmp->subj_hash, 0,
57634+ r_tmp->subj_hash_size *
57635+ sizeof (struct acl_subject_label *));
57636+
57637+ err = copy_user_subjs(r_tmp->hash->first, r_tmp);
57638+
57639+ if (err)
57640+ goto cleanup;
57641+
57642+ /* set nested subject list to null */
57643+ r_tmp->hash->first = NULL;
57644+
57645+ insert_acl_role_label(r_tmp);
57646+ }
57647+
57648+ goto return_err;
57649+ cleanup:
57650+ free_variables();
57651+ return_err:
57652+ return err;
57653+
57654+}
57655+
57656+static int
57657+gracl_init(struct gr_arg *args)
57658+{
57659+ int error = 0;
57660+
57661+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
57662+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
57663+
57664+ if (init_variables(args)) {
57665+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
57666+ error = -ENOMEM;
57667+ free_variables();
57668+ goto out;
57669+ }
57670+
57671+ error = copy_user_acl(args);
57672+ free_init_variables();
57673+ if (error) {
57674+ free_variables();
57675+ goto out;
57676+ }
57677+
57678+ if ((error = gr_set_acls(0))) {
57679+ free_variables();
57680+ goto out;
57681+ }
57682+
57683+ pax_open_kernel();
57684+ gr_status |= GR_READY;
57685+ pax_close_kernel();
57686+
57687+ out:
57688+ return error;
57689+}
57690+
57691+/* derived from glibc fnmatch() 0: match, 1: no match*/
57692+
57693+static int
57694+glob_match(const char *p, const char *n)
57695+{
57696+ char c;
57697+
57698+ while ((c = *p++) != '\0') {
57699+ switch (c) {
57700+ case '?':
57701+ if (*n == '\0')
57702+ return 1;
57703+ else if (*n == '/')
57704+ return 1;
57705+ break;
57706+ case '\\':
57707+ if (*n != c)
57708+ return 1;
57709+ break;
57710+ case '*':
57711+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
57712+ if (*n == '/')
57713+ return 1;
57714+ else if (c == '?') {
57715+ if (*n == '\0')
57716+ return 1;
57717+ else
57718+ ++n;
57719+ }
57720+ }
57721+ if (c == '\0') {
57722+ return 0;
57723+ } else {
57724+ const char *endp;
57725+
57726+ if ((endp = strchr(n, '/')) == NULL)
57727+ endp = n + strlen(n);
57728+
57729+ if (c == '[') {
57730+ for (--p; n < endp; ++n)
57731+ if (!glob_match(p, n))
57732+ return 0;
57733+ } else if (c == '/') {
57734+ while (*n != '\0' && *n != '/')
57735+ ++n;
57736+ if (*n == '/' && !glob_match(p, n + 1))
57737+ return 0;
57738+ } else {
57739+ for (--p; n < endp; ++n)
57740+ if (*n == c && !glob_match(p, n))
57741+ return 0;
57742+ }
57743+
57744+ return 1;
57745+ }
57746+ case '[':
57747+ {
57748+ int not;
57749+ char cold;
57750+
57751+ if (*n == '\0' || *n == '/')
57752+ return 1;
57753+
57754+ not = (*p == '!' || *p == '^');
57755+ if (not)
57756+ ++p;
57757+
57758+ c = *p++;
57759+ for (;;) {
57760+ unsigned char fn = (unsigned char)*n;
57761+
57762+ if (c == '\0')
57763+ return 1;
57764+ else {
57765+ if (c == fn)
57766+ goto matched;
57767+ cold = c;
57768+ c = *p++;
57769+
57770+ if (c == '-' && *p != ']') {
57771+ unsigned char cend = *p++;
57772+
57773+ if (cend == '\0')
57774+ return 1;
57775+
57776+ if (cold <= fn && fn <= cend)
57777+ goto matched;
57778+
57779+ c = *p++;
57780+ }
57781+ }
57782+
57783+ if (c == ']')
57784+ break;
57785+ }
57786+ if (!not)
57787+ return 1;
57788+ break;
57789+ matched:
57790+ while (c != ']') {
57791+ if (c == '\0')
57792+ return 1;
57793+
57794+ c = *p++;
57795+ }
57796+ if (not)
57797+ return 1;
57798+ }
57799+ break;
57800+ default:
57801+ if (c != *n)
57802+ return 1;
57803+ }
57804+
57805+ ++n;
57806+ }
57807+
57808+ if (*n == '\0')
57809+ return 0;
57810+
57811+ if (*n == '/')
57812+ return 0;
57813+
57814+ return 1;
57815+}
57816+
57817+static struct acl_object_label *
57818+chk_glob_label(struct acl_object_label *globbed,
57819+ struct dentry *dentry, struct vfsmount *mnt, char **path)
57820+{
57821+ struct acl_object_label *tmp;
57822+
57823+ if (*path == NULL)
57824+ *path = gr_to_filename_nolock(dentry, mnt);
57825+
57826+ tmp = globbed;
57827+
57828+ while (tmp) {
57829+ if (!glob_match(tmp->filename, *path))
57830+ return tmp;
57831+ tmp = tmp->next;
57832+ }
57833+
57834+ return NULL;
57835+}
57836+
57837+static struct acl_object_label *
57838+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
57839+ const ino_t curr_ino, const dev_t curr_dev,
57840+ const struct acl_subject_label *subj, char **path, const int checkglob)
57841+{
57842+ struct acl_subject_label *tmpsubj;
57843+ struct acl_object_label *retval;
57844+ struct acl_object_label *retval2;
57845+
57846+ tmpsubj = (struct acl_subject_label *) subj;
57847+ read_lock(&gr_inode_lock);
57848+ do {
57849+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
57850+ if (retval) {
57851+ if (checkglob && retval->globbed) {
57852+ retval2 = chk_glob_label(retval->globbed, (struct dentry *)orig_dentry,
57853+ (struct vfsmount *)orig_mnt, path);
57854+ if (retval2)
57855+ retval = retval2;
57856+ }
57857+ break;
57858+ }
57859+ } while ((tmpsubj = tmpsubj->parent_subject));
57860+ read_unlock(&gr_inode_lock);
57861+
57862+ return retval;
57863+}
57864+
57865+static __inline__ struct acl_object_label *
57866+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
57867+ const struct dentry *curr_dentry,
57868+ const struct acl_subject_label *subj, char **path, const int checkglob)
57869+{
57870+ int newglob = checkglob;
57871+
57872+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
57873+ as we don't want a / * rule to match instead of the / object
57874+ don't do this for create lookups that call this function though, since they're looking up
57875+ on the parent and thus need globbing checks on all paths
57876+ */
57877+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
57878+ newglob = GR_NO_GLOB;
57879+
57880+ return __full_lookup(orig_dentry, orig_mnt,
57881+ curr_dentry->d_inode->i_ino,
57882+ __get_dev(curr_dentry), subj, path, newglob);
57883+}
57884+
57885+static struct acl_object_label *
57886+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
57887+ const struct acl_subject_label *subj, char *path, const int checkglob)
57888+{
57889+ struct dentry *dentry = (struct dentry *) l_dentry;
57890+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
57891+ struct acl_object_label *retval;
57892+
57893+ spin_lock(&dcache_lock);
57894+ spin_lock(&vfsmount_lock);
57895+
57896+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
57897+#ifdef CONFIG_NET
57898+ mnt == sock_mnt ||
57899+#endif
57900+#ifdef CONFIG_HUGETLBFS
57901+ (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
57902+#endif
57903+ /* ignore Eric Biederman */
57904+ IS_PRIVATE(l_dentry->d_inode))) {
57905+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
57906+ goto out;
57907+ }
57908+
57909+ for (;;) {
57910+ if (dentry == real_root && mnt == real_root_mnt)
57911+ break;
57912+
57913+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
57914+ if (mnt->mnt_parent == mnt)
57915+ break;
57916+
57917+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
57918+ if (retval != NULL)
57919+ goto out;
57920+
57921+ dentry = mnt->mnt_mountpoint;
57922+ mnt = mnt->mnt_parent;
57923+ continue;
57924+ }
57925+
57926+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
57927+ if (retval != NULL)
57928+ goto out;
57929+
57930+ dentry = dentry->d_parent;
57931+ }
57932+
57933+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
57934+
57935+ if (retval == NULL)
57936+ retval = full_lookup(l_dentry, l_mnt, real_root, subj, &path, checkglob);
57937+out:
57938+ spin_unlock(&vfsmount_lock);
57939+ spin_unlock(&dcache_lock);
57940+
57941+ BUG_ON(retval == NULL);
57942+
57943+ return retval;
57944+}
57945+
57946+static __inline__ struct acl_object_label *
57947+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
57948+ const struct acl_subject_label *subj)
57949+{
57950+ char *path = NULL;
57951+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
57952+}
57953+
57954+static __inline__ struct acl_object_label *
57955+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
57956+ const struct acl_subject_label *subj)
57957+{
57958+ char *path = NULL;
57959+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
57960+}
57961+
57962+static __inline__ struct acl_object_label *
57963+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
57964+ const struct acl_subject_label *subj, char *path)
57965+{
57966+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
57967+}
57968+
57969+static struct acl_subject_label *
57970+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
57971+ const struct acl_role_label *role)
57972+{
57973+ struct dentry *dentry = (struct dentry *) l_dentry;
57974+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
57975+ struct acl_subject_label *retval;
57976+
57977+ spin_lock(&dcache_lock);
57978+ spin_lock(&vfsmount_lock);
57979+
57980+ for (;;) {
57981+ if (dentry == real_root && mnt == real_root_mnt)
57982+ break;
57983+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
57984+ if (mnt->mnt_parent == mnt)
57985+ break;
57986+
57987+ read_lock(&gr_inode_lock);
57988+ retval =
57989+ lookup_acl_subj_label(dentry->d_inode->i_ino,
57990+ __get_dev(dentry), role);
57991+ read_unlock(&gr_inode_lock);
57992+ if (retval != NULL)
57993+ goto out;
57994+
57995+ dentry = mnt->mnt_mountpoint;
57996+ mnt = mnt->mnt_parent;
57997+ continue;
57998+ }
57999+
58000+ read_lock(&gr_inode_lock);
58001+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
58002+ __get_dev(dentry), role);
58003+ read_unlock(&gr_inode_lock);
58004+ if (retval != NULL)
58005+ goto out;
58006+
58007+ dentry = dentry->d_parent;
58008+ }
58009+
58010+ read_lock(&gr_inode_lock);
58011+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
58012+ __get_dev(dentry), role);
58013+ read_unlock(&gr_inode_lock);
58014+
58015+ if (unlikely(retval == NULL)) {
58016+ read_lock(&gr_inode_lock);
58017+ retval = lookup_acl_subj_label(real_root->d_inode->i_ino,
58018+ __get_dev(real_root), role);
58019+ read_unlock(&gr_inode_lock);
58020+ }
58021+out:
58022+ spin_unlock(&vfsmount_lock);
58023+ spin_unlock(&dcache_lock);
58024+
58025+ BUG_ON(retval == NULL);
58026+
58027+ return retval;
58028+}
58029+
58030+static void
58031+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
58032+{
58033+ struct task_struct *task = current;
58034+ const struct cred *cred = current_cred();
58035+
58036+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
58037+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
58038+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
58039+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
58040+
58041+ return;
58042+}
58043+
58044+static void
58045+gr_log_learn_sysctl(const char *path, const __u32 mode)
58046+{
58047+ struct task_struct *task = current;
58048+ const struct cred *cred = current_cred();
58049+
58050+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
58051+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
58052+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
58053+ 1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
58054+
58055+ return;
58056+}
58057+
58058+static void
58059+gr_log_learn_id_change(const char type, const unsigned int real,
58060+ const unsigned int effective, const unsigned int fs)
58061+{
58062+ struct task_struct *task = current;
58063+ const struct cred *cred = current_cred();
58064+
58065+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
58066+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
58067+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
58068+ type, real, effective, fs, &task->signal->saved_ip);
58069+
58070+ return;
58071+}
58072+
58073+__u32
58074+gr_search_file(const struct dentry * dentry, const __u32 mode,
58075+ const struct vfsmount * mnt)
58076+{
58077+ __u32 retval = mode;
58078+ struct acl_subject_label *curracl;
58079+ struct acl_object_label *currobj;
58080+
58081+ if (unlikely(!(gr_status & GR_READY)))
58082+ return (mode & ~GR_AUDITS);
58083+
58084+ curracl = current->acl;
58085+
58086+ currobj = chk_obj_label(dentry, mnt, curracl);
58087+ retval = currobj->mode & mode;
58088+
58089+ /* if we're opening a specified transfer file for writing
58090+ (e.g. /dev/initctl), then transfer our role to init
58091+ */
58092+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
58093+ current->role->roletype & GR_ROLE_PERSIST)) {
58094+ struct task_struct *task = init_pid_ns.child_reaper;
58095+
58096+ if (task->role != current->role) {
58097+ task->acl_sp_role = 0;
58098+ task->acl_role_id = current->acl_role_id;
58099+ task->role = current->role;
58100+ rcu_read_lock();
58101+ read_lock(&grsec_exec_file_lock);
58102+ gr_apply_subject_to_task(task);
58103+ read_unlock(&grsec_exec_file_lock);
58104+ rcu_read_unlock();
58105+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
58106+ }
58107+ }
58108+
58109+ if (unlikely
58110+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
58111+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
58112+ __u32 new_mode = mode;
58113+
58114+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
58115+
58116+ retval = new_mode;
58117+
58118+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
58119+ new_mode |= GR_INHERIT;
58120+
58121+ if (!(mode & GR_NOLEARN))
58122+ gr_log_learn(dentry, mnt, new_mode);
58123+ }
58124+
58125+ return retval;
58126+}
58127+
58128+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
58129+ const struct dentry *parent,
58130+ const struct vfsmount *mnt)
58131+{
58132+ struct name_entry *match;
58133+ struct acl_object_label *matchpo;
58134+ struct acl_subject_label *curracl;
58135+ char *path;
58136+
58137+ if (unlikely(!(gr_status & GR_READY)))
58138+ return NULL;
58139+
58140+ preempt_disable();
58141+ path = gr_to_filename_rbac(new_dentry, mnt);
58142+ match = lookup_name_entry_create(path);
58143+
58144+ curracl = current->acl;
58145+
58146+ if (match) {
58147+ read_lock(&gr_inode_lock);
58148+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
58149+ read_unlock(&gr_inode_lock);
58150+
58151+ if (matchpo) {
58152+ preempt_enable();
58153+ return matchpo;
58154+ }
58155+ }
58156+
58157+ // lookup parent
58158+
58159+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
58160+
58161+ preempt_enable();
58162+ return matchpo;
58163+}
58164+
58165+__u32
58166+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
58167+ const struct vfsmount * mnt, const __u32 mode)
58168+{
58169+ struct acl_object_label *matchpo;
58170+ __u32 retval;
58171+
58172+ if (unlikely(!(gr_status & GR_READY)))
58173+ return (mode & ~GR_AUDITS);
58174+
58175+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
58176+
58177+ retval = matchpo->mode & mode;
58178+
58179+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
58180+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
58181+ __u32 new_mode = mode;
58182+
58183+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
58184+
58185+ gr_log_learn(new_dentry, mnt, new_mode);
58186+ return new_mode;
58187+ }
58188+
58189+ return retval;
58190+}
58191+
58192+__u32
58193+gr_check_link(const struct dentry * new_dentry,
58194+ const struct dentry * parent_dentry,
58195+ const struct vfsmount * parent_mnt,
58196+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
58197+{
58198+ struct acl_object_label *obj;
58199+ __u32 oldmode, newmode;
58200+ __u32 needmode;
58201+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
58202+ GR_DELETE | GR_INHERIT;
58203+
58204+ if (unlikely(!(gr_status & GR_READY)))
58205+ return (GR_CREATE | GR_LINK);
58206+
58207+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
58208+ oldmode = obj->mode;
58209+
58210+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
58211+ newmode = obj->mode;
58212+
58213+ needmode = newmode & checkmodes;
58214+
58215+ // old name for hardlink must have at least the permissions of the new name
58216+ if ((oldmode & needmode) != needmode)
58217+ goto bad;
58218+
58219+ // if old name had restrictions/auditing, make sure the new name does as well
58220+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
58221+
58222+ // don't allow hardlinking of suid/sgid files without permission
58223+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
58224+ needmode |= GR_SETID;
58225+
58226+ if ((newmode & needmode) != needmode)
58227+ goto bad;
58228+
58229+ // enforce minimum permissions
58230+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
58231+ return newmode;
58232+bad:
58233+ needmode = oldmode;
58234+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
58235+ needmode |= GR_SETID;
58236+
58237+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
58238+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
58239+ return (GR_CREATE | GR_LINK);
58240+ } else if (newmode & GR_SUPPRESS)
58241+ return GR_SUPPRESS;
58242+ else
58243+ return 0;
58244+}
58245+
58246+int
58247+gr_check_hidden_task(const struct task_struct *task)
58248+{
58249+ if (unlikely(!(gr_status & GR_READY)))
58250+ return 0;
58251+
58252+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
58253+ return 1;
58254+
58255+ return 0;
58256+}
58257+
58258+int
58259+gr_check_protected_task(const struct task_struct *task)
58260+{
58261+ if (unlikely(!(gr_status & GR_READY) || !task))
58262+ return 0;
58263+
58264+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
58265+ task->acl != current->acl)
58266+ return 1;
58267+
58268+ return 0;
58269+}
58270+
58271+int
58272+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
58273+{
58274+ struct task_struct *p;
58275+ int ret = 0;
58276+
58277+ if (unlikely(!(gr_status & GR_READY) || !pid))
58278+ return ret;
58279+
58280+ read_lock(&tasklist_lock);
58281+ do_each_pid_task(pid, type, p) {
58282+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
58283+ p->acl != current->acl) {
58284+ ret = 1;
58285+ goto out;
58286+ }
58287+ } while_each_pid_task(pid, type, p);
58288+out:
58289+ read_unlock(&tasklist_lock);
58290+
58291+ return ret;
58292+}
58293+
58294+void
58295+gr_copy_label(struct task_struct *tsk)
58296+{
58297+ tsk->signal->used_accept = 0;
58298+ tsk->acl_sp_role = 0;
58299+ tsk->acl_role_id = current->acl_role_id;
58300+ tsk->acl = current->acl;
58301+ tsk->role = current->role;
58302+ tsk->signal->curr_ip = current->signal->curr_ip;
58303+ tsk->signal->saved_ip = current->signal->saved_ip;
58304+ if (current->exec_file)
58305+ get_file(current->exec_file);
58306+ tsk->exec_file = current->exec_file;
58307+ tsk->is_writable = current->is_writable;
58308+ if (unlikely(current->signal->used_accept)) {
58309+ current->signal->curr_ip = 0;
58310+ current->signal->saved_ip = 0;
58311+ }
58312+
58313+ return;
58314+}
58315+
58316+static void
58317+gr_set_proc_res(struct task_struct *task)
58318+{
58319+ struct acl_subject_label *proc;
58320+ unsigned short i;
58321+
58322+ proc = task->acl;
58323+
58324+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
58325+ return;
58326+
58327+ for (i = 0; i < RLIM_NLIMITS; i++) {
58328+ if (!(proc->resmask & (1 << i)))
58329+ continue;
58330+
58331+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
58332+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
58333+ }
58334+
58335+ return;
58336+}
58337+
58338+extern int __gr_process_user_ban(struct user_struct *user);
58339+
58340+int
58341+gr_check_user_change(int real, int effective, int fs)
58342+{
58343+ unsigned int i;
58344+ __u16 num;
58345+ uid_t *uidlist;
58346+ int curuid;
58347+ int realok = 0;
58348+ int effectiveok = 0;
58349+ int fsok = 0;
58350+
58351+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58352+ struct user_struct *user;
58353+
58354+ if (real == -1)
58355+ goto skipit;
58356+
58357+ user = find_user(real);
58358+ if (user == NULL)
58359+ goto skipit;
58360+
58361+ if (__gr_process_user_ban(user)) {
58362+ /* for find_user */
58363+ free_uid(user);
58364+ return 1;
58365+ }
58366+
58367+ /* for find_user */
58368+ free_uid(user);
58369+
58370+skipit:
58371+#endif
58372+
58373+ if (unlikely(!(gr_status & GR_READY)))
58374+ return 0;
58375+
58376+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
58377+ gr_log_learn_id_change('u', real, effective, fs);
58378+
58379+ num = current->acl->user_trans_num;
58380+ uidlist = current->acl->user_transitions;
58381+
58382+ if (uidlist == NULL)
58383+ return 0;
58384+
58385+ if (real == -1)
58386+ realok = 1;
58387+ if (effective == -1)
58388+ effectiveok = 1;
58389+ if (fs == -1)
58390+ fsok = 1;
58391+
58392+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
58393+ for (i = 0; i < num; i++) {
58394+ curuid = (int)uidlist[i];
58395+ if (real == curuid)
58396+ realok = 1;
58397+ if (effective == curuid)
58398+ effectiveok = 1;
58399+ if (fs == curuid)
58400+ fsok = 1;
58401+ }
58402+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
58403+ for (i = 0; i < num; i++) {
58404+ curuid = (int)uidlist[i];
58405+ if (real == curuid)
58406+ break;
58407+ if (effective == curuid)
58408+ break;
58409+ if (fs == curuid)
58410+ break;
58411+ }
58412+ /* not in deny list */
58413+ if (i == num) {
58414+ realok = 1;
58415+ effectiveok = 1;
58416+ fsok = 1;
58417+ }
58418+ }
58419+
58420+ if (realok && effectiveok && fsok)
58421+ return 0;
58422+ else {
58423+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
58424+ return 1;
58425+ }
58426+}
58427+
58428+int
58429+gr_check_group_change(int real, int effective, int fs)
58430+{
58431+ unsigned int i;
58432+ __u16 num;
58433+ gid_t *gidlist;
58434+ int curgid;
58435+ int realok = 0;
58436+ int effectiveok = 0;
58437+ int fsok = 0;
58438+
58439+ if (unlikely(!(gr_status & GR_READY)))
58440+ return 0;
58441+
58442+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
58443+ gr_log_learn_id_change('g', real, effective, fs);
58444+
58445+ num = current->acl->group_trans_num;
58446+ gidlist = current->acl->group_transitions;
58447+
58448+ if (gidlist == NULL)
58449+ return 0;
58450+
58451+ if (real == -1)
58452+ realok = 1;
58453+ if (effective == -1)
58454+ effectiveok = 1;
58455+ if (fs == -1)
58456+ fsok = 1;
58457+
58458+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
58459+ for (i = 0; i < num; i++) {
58460+ curgid = (int)gidlist[i];
58461+ if (real == curgid)
58462+ realok = 1;
58463+ if (effective == curgid)
58464+ effectiveok = 1;
58465+ if (fs == curgid)
58466+ fsok = 1;
58467+ }
58468+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
58469+ for (i = 0; i < num; i++) {
58470+ curgid = (int)gidlist[i];
58471+ if (real == curgid)
58472+ break;
58473+ if (effective == curgid)
58474+ break;
58475+ if (fs == curgid)
58476+ break;
58477+ }
58478+ /* not in deny list */
58479+ if (i == num) {
58480+ realok = 1;
58481+ effectiveok = 1;
58482+ fsok = 1;
58483+ }
58484+ }
58485+
58486+ if (realok && effectiveok && fsok)
58487+ return 0;
58488+ else {
58489+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
58490+ return 1;
58491+ }
58492+}
58493+
58494+extern int gr_acl_is_capable(const int cap);
58495+
58496+void
58497+gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
58498+{
58499+ struct acl_role_label *role = task->role;
58500+ struct acl_subject_label *subj = NULL;
58501+ struct acl_object_label *obj;
58502+ struct file *filp;
58503+
58504+ if (unlikely(!(gr_status & GR_READY)))
58505+ return;
58506+
58507+ filp = task->exec_file;
58508+
58509+ /* kernel process, we'll give them the kernel role */
58510+ if (unlikely(!filp)) {
58511+ task->role = kernel_role;
58512+ task->acl = kernel_role->root_label;
58513+ return;
58514+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
58515+ role = lookup_acl_role_label(task, uid, gid);
58516+
58517+ /* don't change the role if we're not a privileged process */
58518+ if (role && task->role != role &&
58519+ (((role->roletype & GR_ROLE_USER) && gr_acl_is_capable(CAP_SETUID)) ||
58520+ ((role->roletype & GR_ROLE_GROUP) && gr_acl_is_capable(CAP_SETGID))))
58521+ return;
58522+
58523+ /* perform subject lookup in possibly new role
58524+ we can use this result below in the case where role == task->role
58525+ */
58526+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
58527+
58528+ /* if we changed uid/gid, but result in the same role
58529+ and are using inheritance, don't lose the inherited subject
58530+ if current subject is other than what normal lookup
58531+ would result in, we arrived via inheritance, don't
58532+ lose subject
58533+ */
58534+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
58535+ (subj == task->acl)))
58536+ task->acl = subj;
58537+
58538+ task->role = role;
58539+
58540+ task->is_writable = 0;
58541+
58542+ /* ignore additional mmap checks for processes that are writable
58543+ by the default ACL */
58544+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
58545+ if (unlikely(obj->mode & GR_WRITE))
58546+ task->is_writable = 1;
58547+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
58548+ if (unlikely(obj->mode & GR_WRITE))
58549+ task->is_writable = 1;
58550+
58551+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
58552+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
58553+#endif
58554+
58555+ gr_set_proc_res(task);
58556+
58557+ return;
58558+}
58559+
58560+int
58561+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
58562+ const int unsafe_flags)
58563+{
58564+ struct task_struct *task = current;
58565+ struct acl_subject_label *newacl;
58566+ struct acl_object_label *obj;
58567+ __u32 retmode;
58568+
58569+ if (unlikely(!(gr_status & GR_READY)))
58570+ return 0;
58571+
58572+ newacl = chk_subj_label(dentry, mnt, task->role);
58573+
58574+ task_lock(task);
58575+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
58576+ !(task->role->roletype & GR_ROLE_GOD) &&
58577+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
58578+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
58579+ task_unlock(task);
58580+ if (unsafe_flags & LSM_UNSAFE_SHARE)
58581+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
58582+ else
58583+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
58584+ return -EACCES;
58585+ }
58586+ task_unlock(task);
58587+
58588+ obj = chk_obj_label(dentry, mnt, task->acl);
58589+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
58590+
58591+ if (!(task->acl->mode & GR_INHERITLEARN) &&
58592+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
58593+ if (obj->nested)
58594+ task->acl = obj->nested;
58595+ else
58596+ task->acl = newacl;
58597+ } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
58598+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
58599+
58600+ task->is_writable = 0;
58601+
58602+ /* ignore additional mmap checks for processes that are writable
58603+ by the default ACL */
58604+ obj = chk_obj_label(dentry, mnt, default_role->root_label);
58605+ if (unlikely(obj->mode & GR_WRITE))
58606+ task->is_writable = 1;
58607+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
58608+ if (unlikely(obj->mode & GR_WRITE))
58609+ task->is_writable = 1;
58610+
58611+ gr_set_proc_res(task);
58612+
58613+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
58614+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
58615+#endif
58616+ return 0;
58617+}
58618+
58619+/* always called with valid inodev ptr */
58620+static void
58621+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
58622+{
58623+ struct acl_object_label *matchpo;
58624+ struct acl_subject_label *matchps;
58625+ struct acl_subject_label *subj;
58626+ struct acl_role_label *role;
58627+ unsigned int x;
58628+
58629+ FOR_EACH_ROLE_START(role)
58630+ FOR_EACH_SUBJECT_START(role, subj, x)
58631+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
58632+ matchpo->mode |= GR_DELETED;
58633+ FOR_EACH_SUBJECT_END(subj,x)
58634+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
58635+ if (subj->inode == ino && subj->device == dev)
58636+ subj->mode |= GR_DELETED;
58637+ FOR_EACH_NESTED_SUBJECT_END(subj)
58638+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
58639+ matchps->mode |= GR_DELETED;
58640+ FOR_EACH_ROLE_END(role)
58641+
58642+ inodev->nentry->deleted = 1;
58643+
58644+ return;
58645+}
58646+
58647+void
58648+gr_handle_delete(const ino_t ino, const dev_t dev)
58649+{
58650+ struct inodev_entry *inodev;
58651+
58652+ if (unlikely(!(gr_status & GR_READY)))
58653+ return;
58654+
58655+ write_lock(&gr_inode_lock);
58656+ inodev = lookup_inodev_entry(ino, dev);
58657+ if (inodev != NULL)
58658+ do_handle_delete(inodev, ino, dev);
58659+ write_unlock(&gr_inode_lock);
58660+
58661+ return;
58662+}
58663+
58664+static void
58665+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
58666+ const ino_t newinode, const dev_t newdevice,
58667+ struct acl_subject_label *subj)
58668+{
58669+ unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
58670+ struct acl_object_label *match;
58671+
58672+ match = subj->obj_hash[index];
58673+
58674+ while (match && (match->inode != oldinode ||
58675+ match->device != olddevice ||
58676+ !(match->mode & GR_DELETED)))
58677+ match = match->next;
58678+
58679+ if (match && (match->inode == oldinode)
58680+ && (match->device == olddevice)
58681+ && (match->mode & GR_DELETED)) {
58682+ if (match->prev == NULL) {
58683+ subj->obj_hash[index] = match->next;
58684+ if (match->next != NULL)
58685+ match->next->prev = NULL;
58686+ } else {
58687+ match->prev->next = match->next;
58688+ if (match->next != NULL)
58689+ match->next->prev = match->prev;
58690+ }
58691+ match->prev = NULL;
58692+ match->next = NULL;
58693+ match->inode = newinode;
58694+ match->device = newdevice;
58695+ match->mode &= ~GR_DELETED;
58696+
58697+ insert_acl_obj_label(match, subj);
58698+ }
58699+
58700+ return;
58701+}
58702+
58703+static void
58704+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
58705+ const ino_t newinode, const dev_t newdevice,
58706+ struct acl_role_label *role)
58707+{
58708+ unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
58709+ struct acl_subject_label *match;
58710+
58711+ match = role->subj_hash[index];
58712+
58713+ while (match && (match->inode != oldinode ||
58714+ match->device != olddevice ||
58715+ !(match->mode & GR_DELETED)))
58716+ match = match->next;
58717+
58718+ if (match && (match->inode == oldinode)
58719+ && (match->device == olddevice)
58720+ && (match->mode & GR_DELETED)) {
58721+ if (match->prev == NULL) {
58722+ role->subj_hash[index] = match->next;
58723+ if (match->next != NULL)
58724+ match->next->prev = NULL;
58725+ } else {
58726+ match->prev->next = match->next;
58727+ if (match->next != NULL)
58728+ match->next->prev = match->prev;
58729+ }
58730+ match->prev = NULL;
58731+ match->next = NULL;
58732+ match->inode = newinode;
58733+ match->device = newdevice;
58734+ match->mode &= ~GR_DELETED;
58735+
58736+ insert_acl_subj_label(match, role);
58737+ }
58738+
58739+ return;
58740+}
58741+
58742+static void
58743+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
58744+ const ino_t newinode, const dev_t newdevice)
58745+{
58746+ unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
58747+ struct inodev_entry *match;
58748+
58749+ match = inodev_set.i_hash[index];
58750+
58751+ while (match && (match->nentry->inode != oldinode ||
58752+ match->nentry->device != olddevice || !match->nentry->deleted))
58753+ match = match->next;
58754+
58755+ if (match && (match->nentry->inode == oldinode)
58756+ && (match->nentry->device == olddevice) &&
58757+ match->nentry->deleted) {
58758+ if (match->prev == NULL) {
58759+ inodev_set.i_hash[index] = match->next;
58760+ if (match->next != NULL)
58761+ match->next->prev = NULL;
58762+ } else {
58763+ match->prev->next = match->next;
58764+ if (match->next != NULL)
58765+ match->next->prev = match->prev;
58766+ }
58767+ match->prev = NULL;
58768+ match->next = NULL;
58769+ match->nentry->inode = newinode;
58770+ match->nentry->device = newdevice;
58771+ match->nentry->deleted = 0;
58772+
58773+ insert_inodev_entry(match);
58774+ }
58775+
58776+ return;
58777+}
58778+
58779+static void
58780+__do_handle_create(const struct name_entry *matchn, ino_t inode, dev_t dev)
58781+{
58782+ struct acl_subject_label *subj;
58783+ struct acl_role_label *role;
58784+ unsigned int x;
58785+
58786+ FOR_EACH_ROLE_START(role)
58787+ update_acl_subj_label(matchn->inode, matchn->device,
58788+ inode, dev, role);
58789+
58790+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
58791+ if ((subj->inode == inode) && (subj->device == dev)) {
58792+ subj->inode = inode;
58793+ subj->device = dev;
58794+ }
58795+ FOR_EACH_NESTED_SUBJECT_END(subj)
58796+ FOR_EACH_SUBJECT_START(role, subj, x)
58797+ update_acl_obj_label(matchn->inode, matchn->device,
58798+ inode, dev, subj);
58799+ FOR_EACH_SUBJECT_END(subj,x)
58800+ FOR_EACH_ROLE_END(role)
58801+
58802+ update_inodev_entry(matchn->inode, matchn->device, inode, dev);
58803+
58804+ return;
58805+}
58806+
58807+static void
58808+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
58809+ const struct vfsmount *mnt)
58810+{
58811+ ino_t ino = dentry->d_inode->i_ino;
58812+ dev_t dev = __get_dev(dentry);
58813+
58814+ __do_handle_create(matchn, ino, dev);
58815+
58816+ return;
58817+}
58818+
58819+void
58820+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
58821+{
58822+ struct name_entry *matchn;
58823+
58824+ if (unlikely(!(gr_status & GR_READY)))
58825+ return;
58826+
58827+ preempt_disable();
58828+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
58829+
58830+ if (unlikely((unsigned long)matchn)) {
58831+ write_lock(&gr_inode_lock);
58832+ do_handle_create(matchn, dentry, mnt);
58833+ write_unlock(&gr_inode_lock);
58834+ }
58835+ preempt_enable();
58836+
58837+ return;
58838+}
58839+
58840+void
58841+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
58842+{
58843+ struct name_entry *matchn;
58844+
58845+ if (unlikely(!(gr_status & GR_READY)))
58846+ return;
58847+
58848+ preempt_disable();
58849+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
58850+
58851+ if (unlikely((unsigned long)matchn)) {
58852+ write_lock(&gr_inode_lock);
58853+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
58854+ write_unlock(&gr_inode_lock);
58855+ }
58856+ preempt_enable();
58857+
58858+ return;
58859+}
58860+
58861+void
58862+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
58863+ struct dentry *old_dentry,
58864+ struct dentry *new_dentry,
58865+ struct vfsmount *mnt, const __u8 replace)
58866+{
58867+ struct name_entry *matchn;
58868+ struct inodev_entry *inodev;
58869+ struct inode *inode = new_dentry->d_inode;
58870+ ino_t oldinode = old_dentry->d_inode->i_ino;
58871+ dev_t olddev = __get_dev(old_dentry);
58872+
58873+ /* vfs_rename swaps the name and parent link for old_dentry and
58874+ new_dentry
58875+ at this point, old_dentry has the new name, parent link, and inode
58876+ for the renamed file
58877+ if a file is being replaced by a rename, new_dentry has the inode
58878+ and name for the replaced file
58879+ */
58880+
58881+ if (unlikely(!(gr_status & GR_READY)))
58882+ return;
58883+
58884+ preempt_disable();
58885+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
58886+
58887+ /* we wouldn't have to check d_inode if it weren't for
58888+ NFS silly-renaming
58889+ */
58890+
58891+ write_lock(&gr_inode_lock);
58892+ if (unlikely(replace && inode)) {
58893+ ino_t newinode = inode->i_ino;
58894+ dev_t newdev = __get_dev(new_dentry);
58895+ inodev = lookup_inodev_entry(newinode, newdev);
58896+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
58897+ do_handle_delete(inodev, newinode, newdev);
58898+ }
58899+
58900+ inodev = lookup_inodev_entry(oldinode, olddev);
58901+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
58902+ do_handle_delete(inodev, oldinode, olddev);
58903+
58904+ if (unlikely((unsigned long)matchn))
58905+ do_handle_create(matchn, old_dentry, mnt);
58906+
58907+ write_unlock(&gr_inode_lock);
58908+ preempt_enable();
58909+
58910+ return;
58911+}
58912+
58913+static int
58914+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
58915+ unsigned char **sum)
58916+{
58917+ struct acl_role_label *r;
58918+ struct role_allowed_ip *ipp;
58919+ struct role_transition *trans;
58920+ unsigned int i;
58921+ int found = 0;
58922+ u32 curr_ip = current->signal->curr_ip;
58923+
58924+ current->signal->saved_ip = curr_ip;
58925+
58926+ /* check transition table */
58927+
58928+ for (trans = current->role->transitions; trans; trans = trans->next) {
58929+ if (!strcmp(rolename, trans->rolename)) {
58930+ found = 1;
58931+ break;
58932+ }
58933+ }
58934+
58935+ if (!found)
58936+ return 0;
58937+
58938+ /* handle special roles that do not require authentication
58939+ and check ip */
58940+
58941+ FOR_EACH_ROLE_START(r)
58942+ if (!strcmp(rolename, r->rolename) &&
58943+ (r->roletype & GR_ROLE_SPECIAL)) {
58944+ found = 0;
58945+ if (r->allowed_ips != NULL) {
58946+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
58947+ if ((ntohl(curr_ip) & ipp->netmask) ==
58948+ (ntohl(ipp->addr) & ipp->netmask))
58949+ found = 1;
58950+ }
58951+ } else
58952+ found = 2;
58953+ if (!found)
58954+ return 0;
58955+
58956+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
58957+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
58958+ *salt = NULL;
58959+ *sum = NULL;
58960+ return 1;
58961+ }
58962+ }
58963+ FOR_EACH_ROLE_END(r)
58964+
58965+ for (i = 0; i < num_sprole_pws; i++) {
58966+ if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
58967+ *salt = acl_special_roles[i]->salt;
58968+ *sum = acl_special_roles[i]->sum;
58969+ return 1;
58970+ }
58971+ }
58972+
58973+ return 0;
58974+}
58975+
58976+static void
58977+assign_special_role(char *rolename)
58978+{
58979+ struct acl_object_label *obj;
58980+ struct acl_role_label *r;
58981+ struct acl_role_label *assigned = NULL;
58982+ struct task_struct *tsk;
58983+ struct file *filp;
58984+
58985+ FOR_EACH_ROLE_START(r)
58986+ if (!strcmp(rolename, r->rolename) &&
58987+ (r->roletype & GR_ROLE_SPECIAL)) {
58988+ assigned = r;
58989+ break;
58990+ }
58991+ FOR_EACH_ROLE_END(r)
58992+
58993+ if (!assigned)
58994+ return;
58995+
58996+ read_lock(&tasklist_lock);
58997+ read_lock(&grsec_exec_file_lock);
58998+
58999+ tsk = current->real_parent;
59000+ if (tsk == NULL)
59001+ goto out_unlock;
59002+
59003+ filp = tsk->exec_file;
59004+ if (filp == NULL)
59005+ goto out_unlock;
59006+
59007+ tsk->is_writable = 0;
59008+
59009+ tsk->acl_sp_role = 1;
59010+ tsk->acl_role_id = ++acl_sp_role_value;
59011+ tsk->role = assigned;
59012+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
59013+
59014+ /* ignore additional mmap checks for processes that are writable
59015+ by the default ACL */
59016+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
59017+ if (unlikely(obj->mode & GR_WRITE))
59018+ tsk->is_writable = 1;
59019+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
59020+ if (unlikely(obj->mode & GR_WRITE))
59021+ tsk->is_writable = 1;
59022+
59023+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
59024+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
59025+#endif
59026+
59027+out_unlock:
59028+ read_unlock(&grsec_exec_file_lock);
59029+ read_unlock(&tasklist_lock);
59030+ return;
59031+}
59032+
59033+int gr_check_secure_terminal(struct task_struct *task)
59034+{
59035+ struct task_struct *p, *p2, *p3;
59036+ struct files_struct *files;
59037+ struct fdtable *fdt;
59038+ struct file *our_file = NULL, *file;
59039+ int i;
59040+
59041+ if (task->signal->tty == NULL)
59042+ return 1;
59043+
59044+ files = get_files_struct(task);
59045+ if (files != NULL) {
59046+ rcu_read_lock();
59047+ fdt = files_fdtable(files);
59048+ for (i=0; i < fdt->max_fds; i++) {
59049+ file = fcheck_files(files, i);
59050+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
59051+ get_file(file);
59052+ our_file = file;
59053+ }
59054+ }
59055+ rcu_read_unlock();
59056+ put_files_struct(files);
59057+ }
59058+
59059+ if (our_file == NULL)
59060+ return 1;
59061+
59062+ read_lock(&tasklist_lock);
59063+ do_each_thread(p2, p) {
59064+ files = get_files_struct(p);
59065+ if (files == NULL ||
59066+ (p->signal && p->signal->tty == task->signal->tty)) {
59067+ if (files != NULL)
59068+ put_files_struct(files);
59069+ continue;
59070+ }
59071+ rcu_read_lock();
59072+ fdt = files_fdtable(files);
59073+ for (i=0; i < fdt->max_fds; i++) {
59074+ file = fcheck_files(files, i);
59075+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
59076+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
59077+ p3 = task;
59078+ while (p3->pid > 0) {
59079+ if (p3 == p)
59080+ break;
59081+ p3 = p3->real_parent;
59082+ }
59083+ if (p3 == p)
59084+ break;
59085+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
59086+ gr_handle_alertkill(p);
59087+ rcu_read_unlock();
59088+ put_files_struct(files);
59089+ read_unlock(&tasklist_lock);
59090+ fput(our_file);
59091+ return 0;
59092+ }
59093+ }
59094+ rcu_read_unlock();
59095+ put_files_struct(files);
59096+ } while_each_thread(p2, p);
59097+ read_unlock(&tasklist_lock);
59098+
59099+ fput(our_file);
59100+ return 1;
59101+}
59102+
59103+ssize_t
59104+write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
59105+{
59106+ struct gr_arg_wrapper uwrap;
59107+ unsigned char *sprole_salt = NULL;
59108+ unsigned char *sprole_sum = NULL;
59109+ int error = sizeof (struct gr_arg_wrapper);
59110+ int error2 = 0;
59111+
59112+ mutex_lock(&gr_dev_mutex);
59113+
59114+ if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
59115+ error = -EPERM;
59116+ goto out;
59117+ }
59118+
59119+ if (count != sizeof (struct gr_arg_wrapper)) {
59120+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
59121+ error = -EINVAL;
59122+ goto out;
59123+ }
59124+
59125+
59126+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
59127+ gr_auth_expires = 0;
59128+ gr_auth_attempts = 0;
59129+ }
59130+
59131+ if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
59132+ error = -EFAULT;
59133+ goto out;
59134+ }
59135+
59136+ if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
59137+ error = -EINVAL;
59138+ goto out;
59139+ }
59140+
59141+ if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
59142+ error = -EFAULT;
59143+ goto out;
59144+ }
59145+
59146+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
59147+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
59148+ time_after(gr_auth_expires, get_seconds())) {
59149+ error = -EBUSY;
59150+ goto out;
59151+ }
59152+
59153+ /* if non-root trying to do anything other than use a special role,
59154+ do not attempt authentication, do not count towards authentication
59155+ locking
59156+ */
59157+
59158+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
59159+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
59160+ current_uid()) {
59161+ error = -EPERM;
59162+ goto out;
59163+ }
59164+
59165+ /* ensure pw and special role name are null terminated */
59166+
59167+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
59168+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
59169+
59170+ /* Okay.
59171+ * We have our enough of the argument structure..(we have yet
59172+ * to copy_from_user the tables themselves) . Copy the tables
59173+ * only if we need them, i.e. for loading operations. */
59174+
59175+ switch (gr_usermode->mode) {
59176+ case GR_STATUS:
59177+ if (gr_status & GR_READY) {
59178+ error = 1;
59179+ if (!gr_check_secure_terminal(current))
59180+ error = 3;
59181+ } else
59182+ error = 2;
59183+ goto out;
59184+ case GR_SHUTDOWN:
59185+ if ((gr_status & GR_READY)
59186+ && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
59187+ pax_open_kernel();
59188+ gr_status &= ~GR_READY;
59189+ pax_close_kernel();
59190+
59191+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
59192+ free_variables();
59193+ memset(gr_usermode, 0, sizeof (struct gr_arg));
59194+ memset(gr_system_salt, 0, GR_SALT_LEN);
59195+ memset(gr_system_sum, 0, GR_SHA_LEN);
59196+ } else if (gr_status & GR_READY) {
59197+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
59198+ error = -EPERM;
59199+ } else {
59200+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
59201+ error = -EAGAIN;
59202+ }
59203+ break;
59204+ case GR_ENABLE:
59205+ if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
59206+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
59207+ else {
59208+ if (gr_status & GR_READY)
59209+ error = -EAGAIN;
59210+ else
59211+ error = error2;
59212+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
59213+ }
59214+ break;
59215+ case GR_RELOAD:
59216+ if (!(gr_status & GR_READY)) {
59217+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
59218+ error = -EAGAIN;
59219+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
59220+ lock_kernel();
59221+
59222+ pax_open_kernel();
59223+ gr_status &= ~GR_READY;
59224+ pax_close_kernel();
59225+
59226+ free_variables();
59227+ if (!(error2 = gracl_init(gr_usermode))) {
59228+ unlock_kernel();
59229+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
59230+ } else {
59231+ unlock_kernel();
59232+ error = error2;
59233+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
59234+ }
59235+ } else {
59236+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
59237+ error = -EPERM;
59238+ }
59239+ break;
59240+ case GR_SEGVMOD:
59241+ if (unlikely(!(gr_status & GR_READY))) {
59242+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
59243+ error = -EAGAIN;
59244+ break;
59245+ }
59246+
59247+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
59248+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
59249+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
59250+ struct acl_subject_label *segvacl;
59251+ segvacl =
59252+ lookup_acl_subj_label(gr_usermode->segv_inode,
59253+ gr_usermode->segv_device,
59254+ current->role);
59255+ if (segvacl) {
59256+ segvacl->crashes = 0;
59257+ segvacl->expires = 0;
59258+ }
59259+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
59260+ gr_remove_uid(gr_usermode->segv_uid);
59261+ }
59262+ } else {
59263+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
59264+ error = -EPERM;
59265+ }
59266+ break;
59267+ case GR_SPROLE:
59268+ case GR_SPROLEPAM:
59269+ if (unlikely(!(gr_status & GR_READY))) {
59270+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
59271+ error = -EAGAIN;
59272+ break;
59273+ }
59274+
59275+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
59276+ current->role->expires = 0;
59277+ current->role->auth_attempts = 0;
59278+ }
59279+
59280+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
59281+ time_after(current->role->expires, get_seconds())) {
59282+ error = -EBUSY;
59283+ goto out;
59284+ }
59285+
59286+ if (lookup_special_role_auth
59287+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
59288+ && ((!sprole_salt && !sprole_sum)
59289+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
59290+ char *p = "";
59291+ assign_special_role(gr_usermode->sp_role);
59292+ read_lock(&tasklist_lock);
59293+ if (current->real_parent)
59294+ p = current->real_parent->role->rolename;
59295+ read_unlock(&tasklist_lock);
59296+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
59297+ p, acl_sp_role_value);
59298+ } else {
59299+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
59300+ error = -EPERM;
59301+ if(!(current->role->auth_attempts++))
59302+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
59303+
59304+ goto out;
59305+ }
59306+ break;
59307+ case GR_UNSPROLE:
59308+ if (unlikely(!(gr_status & GR_READY))) {
59309+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
59310+ error = -EAGAIN;
59311+ break;
59312+ }
59313+
59314+ if (current->role->roletype & GR_ROLE_SPECIAL) {
59315+ char *p = "";
59316+ int i = 0;
59317+
59318+ read_lock(&tasklist_lock);
59319+ if (current->real_parent) {
59320+ p = current->real_parent->role->rolename;
59321+ i = current->real_parent->acl_role_id;
59322+ }
59323+ read_unlock(&tasklist_lock);
59324+
59325+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
59326+ gr_set_acls(1);
59327+ } else {
59328+ error = -EPERM;
59329+ goto out;
59330+ }
59331+ break;
59332+ default:
59333+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
59334+ error = -EINVAL;
59335+ break;
59336+ }
59337+
59338+ if (error != -EPERM)
59339+ goto out;
59340+
59341+ if(!(gr_auth_attempts++))
59342+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
59343+
59344+ out:
59345+ mutex_unlock(&gr_dev_mutex);
59346+ return error;
59347+}
59348+
59349+/* must be called with
59350+ rcu_read_lock();
59351+ read_lock(&tasklist_lock);
59352+ read_lock(&grsec_exec_file_lock);
59353+*/
59354+int gr_apply_subject_to_task(struct task_struct *task)
59355+{
59356+ struct acl_object_label *obj;
59357+ char *tmpname;
59358+ struct acl_subject_label *tmpsubj;
59359+ struct file *filp;
59360+ struct name_entry *nmatch;
59361+
59362+ filp = task->exec_file;
59363+ if (filp == NULL)
59364+ return 0;
59365+
59366+ /* the following is to apply the correct subject
59367+ on binaries running when the RBAC system
59368+ is enabled, when the binaries have been
59369+ replaced or deleted since their execution
59370+ -----
59371+ when the RBAC system starts, the inode/dev
59372+ from exec_file will be one the RBAC system
59373+ is unaware of. It only knows the inode/dev
59374+ of the present file on disk, or the absence
59375+ of it.
59376+ */
59377+ preempt_disable();
59378+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
59379+
59380+ nmatch = lookup_name_entry(tmpname);
59381+ preempt_enable();
59382+ tmpsubj = NULL;
59383+ if (nmatch) {
59384+ if (nmatch->deleted)
59385+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
59386+ else
59387+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
59388+ if (tmpsubj != NULL)
59389+ task->acl = tmpsubj;
59390+ }
59391+ if (tmpsubj == NULL)
59392+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
59393+ task->role);
59394+ if (task->acl) {
59395+ task->is_writable = 0;
59396+ /* ignore additional mmap checks for processes that are writable
59397+ by the default ACL */
59398+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
59399+ if (unlikely(obj->mode & GR_WRITE))
59400+ task->is_writable = 1;
59401+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
59402+ if (unlikely(obj->mode & GR_WRITE))
59403+ task->is_writable = 1;
59404+
59405+ gr_set_proc_res(task);
59406+
59407+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
59408+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
59409+#endif
59410+ } else {
59411+ return 1;
59412+ }
59413+
59414+ return 0;
59415+}
59416+
59417+int
59418+gr_set_acls(const int type)
59419+{
59420+ struct task_struct *task, *task2;
59421+ struct acl_role_label *role = current->role;
59422+ __u16 acl_role_id = current->acl_role_id;
59423+ const struct cred *cred;
59424+ int ret;
59425+
59426+ rcu_read_lock();
59427+ read_lock(&tasklist_lock);
59428+ read_lock(&grsec_exec_file_lock);
59429+ do_each_thread(task2, task) {
59430+ /* check to see if we're called from the exit handler,
59431+ if so, only replace ACLs that have inherited the admin
59432+ ACL */
59433+
59434+ if (type && (task->role != role ||
59435+ task->acl_role_id != acl_role_id))
59436+ continue;
59437+
59438+ task->acl_role_id = 0;
59439+ task->acl_sp_role = 0;
59440+
59441+ if (task->exec_file) {
59442+ cred = __task_cred(task);
59443+ task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
59444+
59445+ ret = gr_apply_subject_to_task(task);
59446+ if (ret) {
59447+ read_unlock(&grsec_exec_file_lock);
59448+ read_unlock(&tasklist_lock);
59449+ rcu_read_unlock();
59450+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
59451+ return ret;
59452+ }
59453+ } else {
59454+ // it's a kernel process
59455+ task->role = kernel_role;
59456+ task->acl = kernel_role->root_label;
59457+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
59458+ task->acl->mode &= ~GR_PROCFIND;
59459+#endif
59460+ }
59461+ } while_each_thread(task2, task);
59462+ read_unlock(&grsec_exec_file_lock);
59463+ read_unlock(&tasklist_lock);
59464+ rcu_read_unlock();
59465+
59466+ return 0;
59467+}
59468+
59469+void
59470+gr_learn_resource(const struct task_struct *task,
59471+ const int res, const unsigned long wanted, const int gt)
59472+{
59473+ struct acl_subject_label *acl;
59474+ const struct cred *cred;
59475+
59476+ if (unlikely((gr_status & GR_READY) &&
59477+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
59478+ goto skip_reslog;
59479+
59480+#ifdef CONFIG_GRKERNSEC_RESLOG
59481+ gr_log_resource(task, res, wanted, gt);
59482+#endif
59483+ skip_reslog:
59484+
59485+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
59486+ return;
59487+
59488+ acl = task->acl;
59489+
59490+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
59491+ !(acl->resmask & (1 << (unsigned short) res))))
59492+ return;
59493+
59494+ if (wanted >= acl->res[res].rlim_cur) {
59495+ unsigned long res_add;
59496+
59497+ res_add = wanted;
59498+ switch (res) {
59499+ case RLIMIT_CPU:
59500+ res_add += GR_RLIM_CPU_BUMP;
59501+ break;
59502+ case RLIMIT_FSIZE:
59503+ res_add += GR_RLIM_FSIZE_BUMP;
59504+ break;
59505+ case RLIMIT_DATA:
59506+ res_add += GR_RLIM_DATA_BUMP;
59507+ break;
59508+ case RLIMIT_STACK:
59509+ res_add += GR_RLIM_STACK_BUMP;
59510+ break;
59511+ case RLIMIT_CORE:
59512+ res_add += GR_RLIM_CORE_BUMP;
59513+ break;
59514+ case RLIMIT_RSS:
59515+ res_add += GR_RLIM_RSS_BUMP;
59516+ break;
59517+ case RLIMIT_NPROC:
59518+ res_add += GR_RLIM_NPROC_BUMP;
59519+ break;
59520+ case RLIMIT_NOFILE:
59521+ res_add += GR_RLIM_NOFILE_BUMP;
59522+ break;
59523+ case RLIMIT_MEMLOCK:
59524+ res_add += GR_RLIM_MEMLOCK_BUMP;
59525+ break;
59526+ case RLIMIT_AS:
59527+ res_add += GR_RLIM_AS_BUMP;
59528+ break;
59529+ case RLIMIT_LOCKS:
59530+ res_add += GR_RLIM_LOCKS_BUMP;
59531+ break;
59532+ case RLIMIT_SIGPENDING:
59533+ res_add += GR_RLIM_SIGPENDING_BUMP;
59534+ break;
59535+ case RLIMIT_MSGQUEUE:
59536+ res_add += GR_RLIM_MSGQUEUE_BUMP;
59537+ break;
59538+ case RLIMIT_NICE:
59539+ res_add += GR_RLIM_NICE_BUMP;
59540+ break;
59541+ case RLIMIT_RTPRIO:
59542+ res_add += GR_RLIM_RTPRIO_BUMP;
59543+ break;
59544+ case RLIMIT_RTTIME:
59545+ res_add += GR_RLIM_RTTIME_BUMP;
59546+ break;
59547+ }
59548+
59549+ acl->res[res].rlim_cur = res_add;
59550+
59551+ if (wanted > acl->res[res].rlim_max)
59552+ acl->res[res].rlim_max = res_add;
59553+
59554+ /* only log the subject filename, since resource logging is supported for
59555+ single-subject learning only */
59556+ rcu_read_lock();
59557+ cred = __task_cred(task);
59558+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
59559+ task->role->roletype, cred->uid, cred->gid, acl->filename,
59560+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
59561+ "", (unsigned long) res, &task->signal->saved_ip);
59562+ rcu_read_unlock();
59563+ }
59564+
59565+ return;
59566+}
59567+
59568+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
59569+void
59570+pax_set_initial_flags(struct linux_binprm *bprm)
59571+{
59572+ struct task_struct *task = current;
59573+ struct acl_subject_label *proc;
59574+ unsigned long flags;
59575+
59576+ if (unlikely(!(gr_status & GR_READY)))
59577+ return;
59578+
59579+ flags = pax_get_flags(task);
59580+
59581+ proc = task->acl;
59582+
59583+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
59584+ flags &= ~MF_PAX_PAGEEXEC;
59585+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
59586+ flags &= ~MF_PAX_SEGMEXEC;
59587+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
59588+ flags &= ~MF_PAX_RANDMMAP;
59589+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
59590+ flags &= ~MF_PAX_EMUTRAMP;
59591+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
59592+ flags &= ~MF_PAX_MPROTECT;
59593+
59594+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
59595+ flags |= MF_PAX_PAGEEXEC;
59596+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
59597+ flags |= MF_PAX_SEGMEXEC;
59598+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
59599+ flags |= MF_PAX_RANDMMAP;
59600+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
59601+ flags |= MF_PAX_EMUTRAMP;
59602+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
59603+ flags |= MF_PAX_MPROTECT;
59604+
59605+ pax_set_flags(task, flags);
59606+
59607+ return;
59608+}
59609+#endif
59610+
59611+#ifdef CONFIG_SYSCTL
59612+/* Eric Biederman likes breaking userland ABI and every inode-based security
59613+ system to save 35kb of memory */
59614+
59615+/* we modify the passed in filename, but adjust it back before returning */
59616+static struct acl_object_label *gr_lookup_by_name(char *name, unsigned int len)
59617+{
59618+ struct name_entry *nmatch;
59619+ char *p, *lastp = NULL;
59620+ struct acl_object_label *obj = NULL, *tmp;
59621+ struct acl_subject_label *tmpsubj;
59622+ char c = '\0';
59623+
59624+ read_lock(&gr_inode_lock);
59625+
59626+ p = name + len - 1;
59627+ do {
59628+ nmatch = lookup_name_entry(name);
59629+ if (lastp != NULL)
59630+ *lastp = c;
59631+
59632+ if (nmatch == NULL)
59633+ goto next_component;
59634+ tmpsubj = current->acl;
59635+ do {
59636+ obj = lookup_acl_obj_label(nmatch->inode, nmatch->device, tmpsubj);
59637+ if (obj != NULL) {
59638+ tmp = obj->globbed;
59639+ while (tmp) {
59640+ if (!glob_match(tmp->filename, name)) {
59641+ obj = tmp;
59642+ goto found_obj;
59643+ }
59644+ tmp = tmp->next;
59645+ }
59646+ goto found_obj;
59647+ }
59648+ } while ((tmpsubj = tmpsubj->parent_subject));
59649+next_component:
59650+ /* end case */
59651+ if (p == name)
59652+ break;
59653+
59654+ while (*p != '/')
59655+ p--;
59656+ if (p == name)
59657+ lastp = p + 1;
59658+ else {
59659+ lastp = p;
59660+ p--;
59661+ }
59662+ c = *lastp;
59663+ *lastp = '\0';
59664+ } while (1);
59665+found_obj:
59666+ read_unlock(&gr_inode_lock);
59667+ /* obj returned will always be non-null */
59668+ return obj;
59669+}
59670+
59671+/* returns 0 when allowing, non-zero on error
59672+ op of 0 is used for readdir, so we don't log the names of hidden files
59673+*/
59674+__u32
59675+gr_handle_sysctl(const struct ctl_table *table, const int op)
59676+{
59677+ ctl_table *tmp;
59678+ const char *proc_sys = "/proc/sys";
59679+ char *path;
59680+ struct acl_object_label *obj;
59681+ unsigned short len = 0, pos = 0, depth = 0, i;
59682+ __u32 err = 0;
59683+ __u32 mode = 0;
59684+
59685+ if (unlikely(!(gr_status & GR_READY)))
59686+ return 0;
59687+
59688+ /* for now, ignore operations on non-sysctl entries if it's not a
59689+ readdir*/
59690+ if (table->child != NULL && op != 0)
59691+ return 0;
59692+
59693+ mode |= GR_FIND;
59694+ /* it's only a read if it's an entry, read on dirs is for readdir */
59695+ if (op & MAY_READ)
59696+ mode |= GR_READ;
59697+ if (op & MAY_WRITE)
59698+ mode |= GR_WRITE;
59699+
59700+ preempt_disable();
59701+
59702+ path = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
59703+
59704+ /* it's only a read/write if it's an actual entry, not a dir
59705+ (which are opened for readdir)
59706+ */
59707+
59708+ /* convert the requested sysctl entry into a pathname */
59709+
59710+ for (tmp = (ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
59711+ len += strlen(tmp->procname);
59712+ len++;
59713+ depth++;
59714+ }
59715+
59716+ if ((len + depth + strlen(proc_sys) + 1) > PAGE_SIZE) {
59717+ /* deny */
59718+ goto out;
59719+ }
59720+
59721+ memset(path, 0, PAGE_SIZE);
59722+
59723+ memcpy(path, proc_sys, strlen(proc_sys));
59724+
59725+ pos += strlen(proc_sys);
59726+
59727+ for (; depth > 0; depth--) {
59728+ path[pos] = '/';
59729+ pos++;
59730+ for (i = 1, tmp = (ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
59731+ if (depth == i) {
59732+ memcpy(path + pos, tmp->procname,
59733+ strlen(tmp->procname));
59734+ pos += strlen(tmp->procname);
59735+ }
59736+ i++;
59737+ }
59738+ }
59739+
59740+ obj = gr_lookup_by_name(path, pos);
59741+ err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
59742+
59743+ if (unlikely((current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) &&
59744+ ((err & mode) != mode))) {
59745+ __u32 new_mode = mode;
59746+
59747+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
59748+
59749+ err = 0;
59750+ gr_log_learn_sysctl(path, new_mode);
59751+ } else if (!(err & GR_FIND) && !(err & GR_SUPPRESS) && op != 0) {
59752+ gr_log_hidden_sysctl(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, path);
59753+ err = -ENOENT;
59754+ } else if (!(err & GR_FIND)) {
59755+ err = -ENOENT;
59756+ } else if (((err & mode) & ~GR_FIND) != (mode & ~GR_FIND) && !(err & GR_SUPPRESS)) {
59757+ gr_log_str4(GR_DONT_AUDIT, GR_SYSCTL_ACL_MSG, "denied",
59758+ path, (mode & GR_READ) ? " reading" : "",
59759+ (mode & GR_WRITE) ? " writing" : "");
59760+ err = -EACCES;
59761+ } else if ((err & mode) != mode) {
59762+ err = -EACCES;
59763+ } else if ((((err & mode) & ~GR_FIND) == (mode & ~GR_FIND)) && (err & GR_AUDITS)) {
59764+ gr_log_str4(GR_DO_AUDIT, GR_SYSCTL_ACL_MSG, "successful",
59765+ path, (mode & GR_READ) ? " reading" : "",
59766+ (mode & GR_WRITE) ? " writing" : "");
59767+ err = 0;
59768+ } else
59769+ err = 0;
59770+
59771+ out:
59772+ preempt_enable();
59773+
59774+ return err;
59775+}
59776+#endif
59777+
59778+int
59779+gr_handle_proc_ptrace(struct task_struct *task)
59780+{
59781+ struct file *filp;
59782+ struct task_struct *tmp = task;
59783+ struct task_struct *curtemp = current;
59784+ __u32 retmode;
59785+
59786+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
59787+ if (unlikely(!(gr_status & GR_READY)))
59788+ return 0;
59789+#endif
59790+
59791+ read_lock(&tasklist_lock);
59792+ read_lock(&grsec_exec_file_lock);
59793+ filp = task->exec_file;
59794+
59795+ while (tmp->pid > 0) {
59796+ if (tmp == curtemp)
59797+ break;
59798+ tmp = tmp->real_parent;
59799+ }
59800+
59801+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
59802+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
59803+ read_unlock(&grsec_exec_file_lock);
59804+ read_unlock(&tasklist_lock);
59805+ return 1;
59806+ }
59807+
59808+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59809+ if (!(gr_status & GR_READY)) {
59810+ read_unlock(&grsec_exec_file_lock);
59811+ read_unlock(&tasklist_lock);
59812+ return 0;
59813+ }
59814+#endif
59815+
59816+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
59817+ read_unlock(&grsec_exec_file_lock);
59818+ read_unlock(&tasklist_lock);
59819+
59820+ if (retmode & GR_NOPTRACE)
59821+ return 1;
59822+
59823+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
59824+ && (current->acl != task->acl || (current->acl != current->role->root_label
59825+ && current->pid != task->pid)))
59826+ return 1;
59827+
59828+ return 0;
59829+}
59830+
59831+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
59832+{
59833+ if (unlikely(!(gr_status & GR_READY)))
59834+ return;
59835+
59836+ if (!(current->role->roletype & GR_ROLE_GOD))
59837+ return;
59838+
59839+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
59840+ p->role->rolename, gr_task_roletype_to_char(p),
59841+ p->acl->filename);
59842+}
59843+
59844+int
59845+gr_handle_ptrace(struct task_struct *task, const long request)
59846+{
59847+ struct task_struct *tmp = task;
59848+ struct task_struct *curtemp = current;
59849+ __u32 retmode;
59850+
59851+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
59852+ if (unlikely(!(gr_status & GR_READY)))
59853+ return 0;
59854+#endif
59855+
59856+ read_lock(&tasklist_lock);
59857+ while (tmp->pid > 0) {
59858+ if (tmp == curtemp)
59859+ break;
59860+ tmp = tmp->real_parent;
59861+ }
59862+
59863+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
59864+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
59865+ read_unlock(&tasklist_lock);
59866+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
59867+ return 1;
59868+ }
59869+ read_unlock(&tasklist_lock);
59870+
59871+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59872+ if (!(gr_status & GR_READY))
59873+ return 0;
59874+#endif
59875+
59876+ read_lock(&grsec_exec_file_lock);
59877+ if (unlikely(!task->exec_file)) {
59878+ read_unlock(&grsec_exec_file_lock);
59879+ return 0;
59880+ }
59881+
59882+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
59883+ read_unlock(&grsec_exec_file_lock);
59884+
59885+ if (retmode & GR_NOPTRACE) {
59886+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
59887+ return 1;
59888+ }
59889+
59890+ if (retmode & GR_PTRACERD) {
59891+ switch (request) {
59892+ case PTRACE_POKETEXT:
59893+ case PTRACE_POKEDATA:
59894+ case PTRACE_POKEUSR:
59895+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
59896+ case PTRACE_SETREGS:
59897+ case PTRACE_SETFPREGS:
59898+#endif
59899+#ifdef CONFIG_X86
59900+ case PTRACE_SETFPXREGS:
59901+#endif
59902+#ifdef CONFIG_ALTIVEC
59903+ case PTRACE_SETVRREGS:
59904+#endif
59905+ return 1;
59906+ default:
59907+ return 0;
59908+ }
59909+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
59910+ !(current->role->roletype & GR_ROLE_GOD) &&
59911+ (current->acl != task->acl)) {
59912+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
59913+ return 1;
59914+ }
59915+
59916+ return 0;
59917+}
59918+
59919+static int is_writable_mmap(const struct file *filp)
59920+{
59921+ struct task_struct *task = current;
59922+ struct acl_object_label *obj, *obj2;
59923+
59924+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
59925+ !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))) {
59926+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
59927+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
59928+ task->role->root_label);
59929+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
59930+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
59931+ return 1;
59932+ }
59933+ }
59934+ return 0;
59935+}
59936+
59937+int
59938+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
59939+{
59940+ __u32 mode;
59941+
59942+ if (unlikely(!file || !(prot & PROT_EXEC)))
59943+ return 1;
59944+
59945+ if (is_writable_mmap(file))
59946+ return 0;
59947+
59948+ mode =
59949+ gr_search_file(file->f_path.dentry,
59950+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
59951+ file->f_path.mnt);
59952+
59953+ if (!gr_tpe_allow(file))
59954+ return 0;
59955+
59956+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
59957+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
59958+ return 0;
59959+ } else if (unlikely(!(mode & GR_EXEC))) {
59960+ return 0;
59961+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
59962+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
59963+ return 1;
59964+ }
59965+
59966+ return 1;
59967+}
59968+
59969+int
59970+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
59971+{
59972+ __u32 mode;
59973+
59974+ if (unlikely(!file || !(prot & PROT_EXEC)))
59975+ return 1;
59976+
59977+ if (is_writable_mmap(file))
59978+ return 0;
59979+
59980+ mode =
59981+ gr_search_file(file->f_path.dentry,
59982+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
59983+ file->f_path.mnt);
59984+
59985+ if (!gr_tpe_allow(file))
59986+ return 0;
59987+
59988+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
59989+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
59990+ return 0;
59991+ } else if (unlikely(!(mode & GR_EXEC))) {
59992+ return 0;
59993+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
59994+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
59995+ return 1;
59996+ }
59997+
59998+ return 1;
59999+}
60000+
60001+void
60002+gr_acl_handle_psacct(struct task_struct *task, const long code)
60003+{
60004+ unsigned long runtime;
60005+ unsigned long cputime;
60006+ unsigned int wday, cday;
60007+ __u8 whr, chr;
60008+ __u8 wmin, cmin;
60009+ __u8 wsec, csec;
60010+ struct timespec timeval;
60011+
60012+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
60013+ !(task->acl->mode & GR_PROCACCT)))
60014+ return;
60015+
60016+ do_posix_clock_monotonic_gettime(&timeval);
60017+ runtime = timeval.tv_sec - task->start_time.tv_sec;
60018+ wday = runtime / (3600 * 24);
60019+ runtime -= wday * (3600 * 24);
60020+ whr = runtime / 3600;
60021+ runtime -= whr * 3600;
60022+ wmin = runtime / 60;
60023+ runtime -= wmin * 60;
60024+ wsec = runtime;
60025+
60026+ cputime = (task->utime + task->stime) / HZ;
60027+ cday = cputime / (3600 * 24);
60028+ cputime -= cday * (3600 * 24);
60029+ chr = cputime / 3600;
60030+ cputime -= chr * 3600;
60031+ cmin = cputime / 60;
60032+ cputime -= cmin * 60;
60033+ csec = cputime;
60034+
60035+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
60036+
60037+ return;
60038+}
60039+
60040+void gr_set_kernel_label(struct task_struct *task)
60041+{
60042+ if (gr_status & GR_READY) {
60043+ task->role = kernel_role;
60044+ task->acl = kernel_role->root_label;
60045+ }
60046+ return;
60047+}
60048+
60049+#ifdef CONFIG_TASKSTATS
60050+int gr_is_taskstats_denied(int pid)
60051+{
60052+ struct task_struct *task;
60053+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60054+ const struct cred *cred;
60055+#endif
60056+ int ret = 0;
60057+
60058+ /* restrict taskstats viewing to un-chrooted root users
60059+ who have the 'view' subject flag if the RBAC system is enabled
60060+ */
60061+
60062+ rcu_read_lock();
60063+ read_lock(&tasklist_lock);
60064+ task = find_task_by_vpid(pid);
60065+ if (task) {
60066+#ifdef CONFIG_GRKERNSEC_CHROOT
60067+ if (proc_is_chrooted(task))
60068+ ret = -EACCES;
60069+#endif
60070+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60071+ cred = __task_cred(task);
60072+#ifdef CONFIG_GRKERNSEC_PROC_USER
60073+ if (cred->uid != 0)
60074+ ret = -EACCES;
60075+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60076+ if (cred->uid != 0 && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID))
60077+ ret = -EACCES;
60078+#endif
60079+#endif
60080+ if (gr_status & GR_READY) {
60081+ if (!(task->acl->mode & GR_VIEW))
60082+ ret = -EACCES;
60083+ }
60084+ } else
60085+ ret = -ENOENT;
60086+
60087+ read_unlock(&tasklist_lock);
60088+ rcu_read_unlock();
60089+
60090+ return ret;
60091+}
60092+#endif
60093+
60094+/* AUXV entries are filled via a descendant of search_binary_handler
60095+ after we've already applied the subject for the target
60096+*/
60097+int gr_acl_enable_at_secure(void)
60098+{
60099+ if (unlikely(!(gr_status & GR_READY)))
60100+ return 0;
60101+
60102+ if (current->acl->mode & GR_ATSECURE)
60103+ return 1;
60104+
60105+ return 0;
60106+}
60107+
60108+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
60109+{
60110+ struct task_struct *task = current;
60111+ struct dentry *dentry = file->f_path.dentry;
60112+ struct vfsmount *mnt = file->f_path.mnt;
60113+ struct acl_object_label *obj, *tmp;
60114+ struct acl_subject_label *subj;
60115+ unsigned int bufsize;
60116+ int is_not_root;
60117+ char *path;
60118+ dev_t dev = __get_dev(dentry);
60119+
60120+ if (unlikely(!(gr_status & GR_READY)))
60121+ return 1;
60122+
60123+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
60124+ return 1;
60125+
60126+ /* ignore Eric Biederman */
60127+ if (IS_PRIVATE(dentry->d_inode))
60128+ return 1;
60129+
60130+ subj = task->acl;
60131+ do {
60132+ obj = lookup_acl_obj_label(ino, dev, subj);
60133+ if (obj != NULL)
60134+ return (obj->mode & GR_FIND) ? 1 : 0;
60135+ } while ((subj = subj->parent_subject));
60136+
60137+ /* this is purely an optimization since we're looking for an object
60138+ for the directory we're doing a readdir on
60139+ if it's possible for any globbed object to match the entry we're
60140+ filling into the directory, then the object we find here will be
60141+ an anchor point with attached globbed objects
60142+ */
60143+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
60144+ if (obj->globbed == NULL)
60145+ return (obj->mode & GR_FIND) ? 1 : 0;
60146+
60147+ is_not_root = ((obj->filename[0] == '/') &&
60148+ (obj->filename[1] == '\0')) ? 0 : 1;
60149+ bufsize = PAGE_SIZE - namelen - is_not_root;
60150+
60151+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
60152+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
60153+ return 1;
60154+
60155+ preempt_disable();
60156+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
60157+ bufsize);
60158+
60159+ bufsize = strlen(path);
60160+
60161+ /* if base is "/", don't append an additional slash */
60162+ if (is_not_root)
60163+ *(path + bufsize) = '/';
60164+ memcpy(path + bufsize + is_not_root, name, namelen);
60165+ *(path + bufsize + namelen + is_not_root) = '\0';
60166+
60167+ tmp = obj->globbed;
60168+ while (tmp) {
60169+ if (!glob_match(tmp->filename, path)) {
60170+ preempt_enable();
60171+ return (tmp->mode & GR_FIND) ? 1 : 0;
60172+ }
60173+ tmp = tmp->next;
60174+ }
60175+ preempt_enable();
60176+ return (obj->mode & GR_FIND) ? 1 : 0;
60177+}
60178+
60179+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
60180+EXPORT_SYMBOL(gr_acl_is_enabled);
60181+#endif
60182+EXPORT_SYMBOL(gr_learn_resource);
60183+EXPORT_SYMBOL(gr_set_kernel_label);
60184+#ifdef CONFIG_SECURITY
60185+EXPORT_SYMBOL(gr_check_user_change);
60186+EXPORT_SYMBOL(gr_check_group_change);
60187+#endif
60188+
60189diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
60190new file mode 100644
60191index 0000000..34fefda
60192--- /dev/null
60193+++ b/grsecurity/gracl_alloc.c
60194@@ -0,0 +1,105 @@
60195+#include <linux/kernel.h>
60196+#include <linux/mm.h>
60197+#include <linux/slab.h>
60198+#include <linux/vmalloc.h>
60199+#include <linux/gracl.h>
60200+#include <linux/grsecurity.h>
60201+
60202+static unsigned long alloc_stack_next = 1;
60203+static unsigned long alloc_stack_size = 1;
60204+static void **alloc_stack;
60205+
60206+static __inline__ int
60207+alloc_pop(void)
60208+{
60209+ if (alloc_stack_next == 1)
60210+ return 0;
60211+
60212+ kfree(alloc_stack[alloc_stack_next - 2]);
60213+
60214+ alloc_stack_next--;
60215+
60216+ return 1;
60217+}
60218+
60219+static __inline__ int
60220+alloc_push(void *buf)
60221+{
60222+ if (alloc_stack_next >= alloc_stack_size)
60223+ return 1;
60224+
60225+ alloc_stack[alloc_stack_next - 1] = buf;
60226+
60227+ alloc_stack_next++;
60228+
60229+ return 0;
60230+}
60231+
60232+void *
60233+acl_alloc(unsigned long len)
60234+{
60235+ void *ret = NULL;
60236+
60237+ if (!len || len > PAGE_SIZE)
60238+ goto out;
60239+
60240+ ret = kmalloc(len, GFP_KERNEL);
60241+
60242+ if (ret) {
60243+ if (alloc_push(ret)) {
60244+ kfree(ret);
60245+ ret = NULL;
60246+ }
60247+ }
60248+
60249+out:
60250+ return ret;
60251+}
60252+
60253+void *
60254+acl_alloc_num(unsigned long num, unsigned long len)
60255+{
60256+ if (!len || (num > (PAGE_SIZE / len)))
60257+ return NULL;
60258+
60259+ return acl_alloc(num * len);
60260+}
60261+
60262+void
60263+acl_free_all(void)
60264+{
60265+ if (gr_acl_is_enabled() || !alloc_stack)
60266+ return;
60267+
60268+ while (alloc_pop()) ;
60269+
60270+ if (alloc_stack) {
60271+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
60272+ kfree(alloc_stack);
60273+ else
60274+ vfree(alloc_stack);
60275+ }
60276+
60277+ alloc_stack = NULL;
60278+ alloc_stack_size = 1;
60279+ alloc_stack_next = 1;
60280+
60281+ return;
60282+}
60283+
60284+int
60285+acl_alloc_stack_init(unsigned long size)
60286+{
60287+ if ((size * sizeof (void *)) <= PAGE_SIZE)
60288+ alloc_stack =
60289+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
60290+ else
60291+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
60292+
60293+ alloc_stack_size = size;
60294+
60295+ if (!alloc_stack)
60296+ return 0;
60297+ else
60298+ return 1;
60299+}
60300diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
60301new file mode 100644
60302index 0000000..955ddfb
60303--- /dev/null
60304+++ b/grsecurity/gracl_cap.c
60305@@ -0,0 +1,101 @@
60306+#include <linux/kernel.h>
60307+#include <linux/module.h>
60308+#include <linux/sched.h>
60309+#include <linux/gracl.h>
60310+#include <linux/grsecurity.h>
60311+#include <linux/grinternal.h>
60312+
60313+extern const char *captab_log[];
60314+extern int captab_log_entries;
60315+
60316+int
60317+gr_acl_is_capable(const int cap)
60318+{
60319+ struct task_struct *task = current;
60320+ const struct cred *cred = current_cred();
60321+ struct acl_subject_label *curracl;
60322+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
60323+ kernel_cap_t cap_audit = __cap_empty_set;
60324+
60325+ if (!gr_acl_is_enabled())
60326+ return 1;
60327+
60328+ curracl = task->acl;
60329+
60330+ cap_drop = curracl->cap_lower;
60331+ cap_mask = curracl->cap_mask;
60332+ cap_audit = curracl->cap_invert_audit;
60333+
60334+ while ((curracl = curracl->parent_subject)) {
60335+ /* if the cap isn't specified in the current computed mask but is specified in the
60336+ current level subject, and is lowered in the current level subject, then add
60337+ it to the set of dropped capabilities
60338+ otherwise, add the current level subject's mask to the current computed mask
60339+ */
60340+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
60341+ cap_raise(cap_mask, cap);
60342+ if (cap_raised(curracl->cap_lower, cap))
60343+ cap_raise(cap_drop, cap);
60344+ if (cap_raised(curracl->cap_invert_audit, cap))
60345+ cap_raise(cap_audit, cap);
60346+ }
60347+ }
60348+
60349+ if (!cap_raised(cap_drop, cap)) {
60350+ if (cap_raised(cap_audit, cap))
60351+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
60352+ return 1;
60353+ }
60354+
60355+ curracl = task->acl;
60356+
60357+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
60358+ && cap_raised(cred->cap_effective, cap)) {
60359+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
60360+ task->role->roletype, cred->uid,
60361+ cred->gid, task->exec_file ?
60362+ gr_to_filename(task->exec_file->f_path.dentry,
60363+ task->exec_file->f_path.mnt) : curracl->filename,
60364+ curracl->filename, 0UL,
60365+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
60366+ return 1;
60367+ }
60368+
60369+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
60370+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
60371+ return 0;
60372+}
60373+
60374+int
60375+gr_acl_is_capable_nolog(const int cap)
60376+{
60377+ struct acl_subject_label *curracl;
60378+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
60379+
60380+ if (!gr_acl_is_enabled())
60381+ return 1;
60382+
60383+ curracl = current->acl;
60384+
60385+ cap_drop = curracl->cap_lower;
60386+ cap_mask = curracl->cap_mask;
60387+
60388+ while ((curracl = curracl->parent_subject)) {
60389+ /* if the cap isn't specified in the current computed mask but is specified in the
60390+ current level subject, and is lowered in the current level subject, then add
60391+ it to the set of dropped capabilities
60392+ otherwise, add the current level subject's mask to the current computed mask
60393+ */
60394+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
60395+ cap_raise(cap_mask, cap);
60396+ if (cap_raised(curracl->cap_lower, cap))
60397+ cap_raise(cap_drop, cap);
60398+ }
60399+ }
60400+
60401+ if (!cap_raised(cap_drop, cap))
60402+ return 1;
60403+
60404+ return 0;
60405+}
60406+
60407diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
60408new file mode 100644
60409index 0000000..d5f210c
60410--- /dev/null
60411+++ b/grsecurity/gracl_fs.c
60412@@ -0,0 +1,433 @@
60413+#include <linux/kernel.h>
60414+#include <linux/sched.h>
60415+#include <linux/types.h>
60416+#include <linux/fs.h>
60417+#include <linux/file.h>
60418+#include <linux/stat.h>
60419+#include <linux/grsecurity.h>
60420+#include <linux/grinternal.h>
60421+#include <linux/gracl.h>
60422+
60423+__u32
60424+gr_acl_handle_hidden_file(const struct dentry * dentry,
60425+ const struct vfsmount * mnt)
60426+{
60427+ __u32 mode;
60428+
60429+ if (unlikely(!dentry->d_inode))
60430+ return GR_FIND;
60431+
60432+ mode =
60433+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
60434+
60435+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
60436+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
60437+ return mode;
60438+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
60439+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
60440+ return 0;
60441+ } else if (unlikely(!(mode & GR_FIND)))
60442+ return 0;
60443+
60444+ return GR_FIND;
60445+}
60446+
60447+__u32
60448+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
60449+ int acc_mode)
60450+{
60451+ __u32 reqmode = GR_FIND;
60452+ __u32 mode;
60453+
60454+ if (unlikely(!dentry->d_inode))
60455+ return reqmode;
60456+
60457+ if (acc_mode & MAY_APPEND)
60458+ reqmode |= GR_APPEND;
60459+ else if (acc_mode & MAY_WRITE)
60460+ reqmode |= GR_WRITE;
60461+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
60462+ reqmode |= GR_READ;
60463+
60464+ mode =
60465+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
60466+ mnt);
60467+
60468+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
60469+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
60470+ reqmode & GR_READ ? " reading" : "",
60471+ reqmode & GR_WRITE ? " writing" : reqmode &
60472+ GR_APPEND ? " appending" : "");
60473+ return reqmode;
60474+ } else
60475+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
60476+ {
60477+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
60478+ reqmode & GR_READ ? " reading" : "",
60479+ reqmode & GR_WRITE ? " writing" : reqmode &
60480+ GR_APPEND ? " appending" : "");
60481+ return 0;
60482+ } else if (unlikely((mode & reqmode) != reqmode))
60483+ return 0;
60484+
60485+ return reqmode;
60486+}
60487+
60488+__u32
60489+gr_acl_handle_creat(const struct dentry * dentry,
60490+ const struct dentry * p_dentry,
60491+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
60492+ const int imode)
60493+{
60494+ __u32 reqmode = GR_WRITE | GR_CREATE;
60495+ __u32 mode;
60496+
60497+ if (acc_mode & MAY_APPEND)
60498+ reqmode |= GR_APPEND;
60499+ // if a directory was required or the directory already exists, then
60500+ // don't count this open as a read
60501+ if ((acc_mode & MAY_READ) &&
60502+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
60503+ reqmode |= GR_READ;
60504+ if ((open_flags & O_CREAT) && (imode & (S_ISUID | S_ISGID)))
60505+ reqmode |= GR_SETID;
60506+
60507+ mode =
60508+ gr_check_create(dentry, p_dentry, p_mnt,
60509+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
60510+
60511+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
60512+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
60513+ reqmode & GR_READ ? " reading" : "",
60514+ reqmode & GR_WRITE ? " writing" : reqmode &
60515+ GR_APPEND ? " appending" : "");
60516+ return reqmode;
60517+ } else
60518+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
60519+ {
60520+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
60521+ reqmode & GR_READ ? " reading" : "",
60522+ reqmode & GR_WRITE ? " writing" : reqmode &
60523+ GR_APPEND ? " appending" : "");
60524+ return 0;
60525+ } else if (unlikely((mode & reqmode) != reqmode))
60526+ return 0;
60527+
60528+ return reqmode;
60529+}
60530+
60531+__u32
60532+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
60533+ const int fmode)
60534+{
60535+ __u32 mode, reqmode = GR_FIND;
60536+
60537+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
60538+ reqmode |= GR_EXEC;
60539+ if (fmode & S_IWOTH)
60540+ reqmode |= GR_WRITE;
60541+ if (fmode & S_IROTH)
60542+ reqmode |= GR_READ;
60543+
60544+ mode =
60545+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
60546+ mnt);
60547+
60548+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
60549+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
60550+ reqmode & GR_READ ? " reading" : "",
60551+ reqmode & GR_WRITE ? " writing" : "",
60552+ reqmode & GR_EXEC ? " executing" : "");
60553+ return reqmode;
60554+ } else
60555+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
60556+ {
60557+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
60558+ reqmode & GR_READ ? " reading" : "",
60559+ reqmode & GR_WRITE ? " writing" : "",
60560+ reqmode & GR_EXEC ? " executing" : "");
60561+ return 0;
60562+ } else if (unlikely((mode & reqmode) != reqmode))
60563+ return 0;
60564+
60565+ return reqmode;
60566+}
60567+
60568+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
60569+{
60570+ __u32 mode;
60571+
60572+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
60573+
60574+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
60575+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
60576+ return mode;
60577+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
60578+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
60579+ return 0;
60580+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
60581+ return 0;
60582+
60583+ return (reqmode);
60584+}
60585+
60586+__u32
60587+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
60588+{
60589+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
60590+}
60591+
60592+__u32
60593+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
60594+{
60595+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
60596+}
60597+
60598+__u32
60599+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
60600+{
60601+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
60602+}
60603+
60604+__u32
60605+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
60606+{
60607+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
60608+}
60609+
60610+__u32
60611+gr_acl_handle_fchmod(const struct dentry *dentry, const struct vfsmount *mnt,
60612+ mode_t mode)
60613+{
60614+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
60615+ return 1;
60616+
60617+ if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
60618+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
60619+ GR_FCHMOD_ACL_MSG);
60620+ } else {
60621+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_FCHMOD_ACL_MSG);
60622+ }
60623+}
60624+
60625+__u32
60626+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
60627+ mode_t mode)
60628+{
60629+ if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
60630+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
60631+ GR_CHMOD_ACL_MSG);
60632+ } else {
60633+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
60634+ }
60635+}
60636+
60637+__u32
60638+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
60639+{
60640+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
60641+}
60642+
60643+__u32
60644+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
60645+{
60646+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
60647+}
60648+
60649+__u32
60650+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
60651+{
60652+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
60653+}
60654+
60655+__u32
60656+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
60657+{
60658+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
60659+ GR_UNIXCONNECT_ACL_MSG);
60660+}
60661+
60662+/* hardlinks require at minimum create and link permission,
60663+ any additional privilege required is based on the
60664+ privilege of the file being linked to
60665+*/
60666+__u32
60667+gr_acl_handle_link(const struct dentry * new_dentry,
60668+ const struct dentry * parent_dentry,
60669+ const struct vfsmount * parent_mnt,
60670+ const struct dentry * old_dentry,
60671+ const struct vfsmount * old_mnt, const char *to)
60672+{
60673+ __u32 mode;
60674+ __u32 needmode = GR_CREATE | GR_LINK;
60675+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
60676+
60677+ mode =
60678+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
60679+ old_mnt);
60680+
60681+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
60682+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
60683+ return mode;
60684+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
60685+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
60686+ return 0;
60687+ } else if (unlikely((mode & needmode) != needmode))
60688+ return 0;
60689+
60690+ return 1;
60691+}
60692+
60693+__u32
60694+gr_acl_handle_symlink(const struct dentry * new_dentry,
60695+ const struct dentry * parent_dentry,
60696+ const struct vfsmount * parent_mnt, const char *from)
60697+{
60698+ __u32 needmode = GR_WRITE | GR_CREATE;
60699+ __u32 mode;
60700+
60701+ mode =
60702+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
60703+ GR_CREATE | GR_AUDIT_CREATE |
60704+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
60705+
60706+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
60707+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
60708+ return mode;
60709+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
60710+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
60711+ return 0;
60712+ } else if (unlikely((mode & needmode) != needmode))
60713+ return 0;
60714+
60715+ return (GR_WRITE | GR_CREATE);
60716+}
60717+
60718+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)
60719+{
60720+ __u32 mode;
60721+
60722+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
60723+
60724+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
60725+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
60726+ return mode;
60727+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
60728+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
60729+ return 0;
60730+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
60731+ return 0;
60732+
60733+ return (reqmode);
60734+}
60735+
60736+__u32
60737+gr_acl_handle_mknod(const struct dentry * new_dentry,
60738+ const struct dentry * parent_dentry,
60739+ const struct vfsmount * parent_mnt,
60740+ const int mode)
60741+{
60742+ __u32 reqmode = GR_WRITE | GR_CREATE;
60743+ if (unlikely(mode & (S_ISUID | S_ISGID)))
60744+ reqmode |= GR_SETID;
60745+
60746+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
60747+ reqmode, GR_MKNOD_ACL_MSG);
60748+}
60749+
60750+__u32
60751+gr_acl_handle_mkdir(const struct dentry *new_dentry,
60752+ const struct dentry *parent_dentry,
60753+ const struct vfsmount *parent_mnt)
60754+{
60755+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
60756+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
60757+}
60758+
60759+#define RENAME_CHECK_SUCCESS(old, new) \
60760+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
60761+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
60762+
60763+int
60764+gr_acl_handle_rename(struct dentry *new_dentry,
60765+ struct dentry *parent_dentry,
60766+ const struct vfsmount *parent_mnt,
60767+ struct dentry *old_dentry,
60768+ struct inode *old_parent_inode,
60769+ struct vfsmount *old_mnt, const char *newname)
60770+{
60771+ __u32 comp1, comp2;
60772+ int error = 0;
60773+
60774+ if (unlikely(!gr_acl_is_enabled()))
60775+ return 0;
60776+
60777+ if (!new_dentry->d_inode) {
60778+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
60779+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
60780+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
60781+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
60782+ GR_DELETE | GR_AUDIT_DELETE |
60783+ GR_AUDIT_READ | GR_AUDIT_WRITE |
60784+ GR_SUPPRESS, old_mnt);
60785+ } else {
60786+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
60787+ GR_CREATE | GR_DELETE |
60788+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
60789+ GR_AUDIT_READ | GR_AUDIT_WRITE |
60790+ GR_SUPPRESS, parent_mnt);
60791+ comp2 =
60792+ gr_search_file(old_dentry,
60793+ GR_READ | GR_WRITE | GR_AUDIT_READ |
60794+ GR_DELETE | GR_AUDIT_DELETE |
60795+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
60796+ }
60797+
60798+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
60799+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
60800+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
60801+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
60802+ && !(comp2 & GR_SUPPRESS)) {
60803+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
60804+ error = -EACCES;
60805+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
60806+ error = -EACCES;
60807+
60808+ return error;
60809+}
60810+
60811+void
60812+gr_acl_handle_exit(void)
60813+{
60814+ u16 id;
60815+ char *rolename;
60816+ struct file *exec_file;
60817+
60818+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
60819+ !(current->role->roletype & GR_ROLE_PERSIST))) {
60820+ id = current->acl_role_id;
60821+ rolename = current->role->rolename;
60822+ gr_set_acls(1);
60823+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
60824+ }
60825+
60826+ write_lock(&grsec_exec_file_lock);
60827+ exec_file = current->exec_file;
60828+ current->exec_file = NULL;
60829+ write_unlock(&grsec_exec_file_lock);
60830+
60831+ if (exec_file)
60832+ fput(exec_file);
60833+}
60834+
60835+int
60836+gr_acl_handle_procpidmem(const struct task_struct *task)
60837+{
60838+ if (unlikely(!gr_acl_is_enabled()))
60839+ return 0;
60840+
60841+ if (task != current && task->acl->mode & GR_PROTPROCFD)
60842+ return -EACCES;
60843+
60844+ return 0;
60845+}
60846diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
60847new file mode 100644
60848index 0000000..cd07b96
60849--- /dev/null
60850+++ b/grsecurity/gracl_ip.c
60851@@ -0,0 +1,382 @@
60852+#include <linux/kernel.h>
60853+#include <asm/uaccess.h>
60854+#include <asm/errno.h>
60855+#include <net/sock.h>
60856+#include <linux/file.h>
60857+#include <linux/fs.h>
60858+#include <linux/net.h>
60859+#include <linux/in.h>
60860+#include <linux/skbuff.h>
60861+#include <linux/ip.h>
60862+#include <linux/udp.h>
60863+#include <linux/smp_lock.h>
60864+#include <linux/types.h>
60865+#include <linux/sched.h>
60866+#include <linux/netdevice.h>
60867+#include <linux/inetdevice.h>
60868+#include <linux/gracl.h>
60869+#include <linux/grsecurity.h>
60870+#include <linux/grinternal.h>
60871+
60872+#define GR_BIND 0x01
60873+#define GR_CONNECT 0x02
60874+#define GR_INVERT 0x04
60875+#define GR_BINDOVERRIDE 0x08
60876+#define GR_CONNECTOVERRIDE 0x10
60877+#define GR_SOCK_FAMILY 0x20
60878+
60879+static const char * gr_protocols[IPPROTO_MAX] = {
60880+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
60881+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
60882+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
60883+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
60884+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
60885+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
60886+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
60887+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
60888+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
60889+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
60890+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
60891+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
60892+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
60893+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
60894+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
60895+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
60896+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
60897+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
60898+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
60899+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
60900+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
60901+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
60902+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
60903+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
60904+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
60905+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
60906+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
60907+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
60908+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
60909+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
60910+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
60911+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
60912+ };
60913+
60914+static const char * gr_socktypes[SOCK_MAX] = {
60915+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
60916+ "unknown:7", "unknown:8", "unknown:9", "packet"
60917+ };
60918+
60919+static const char * gr_sockfamilies[AF_MAX+1] = {
60920+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
60921+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
60922+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
60923+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154"
60924+ };
60925+
60926+const char *
60927+gr_proto_to_name(unsigned char proto)
60928+{
60929+ return gr_protocols[proto];
60930+}
60931+
60932+const char *
60933+gr_socktype_to_name(unsigned char type)
60934+{
60935+ return gr_socktypes[type];
60936+}
60937+
60938+const char *
60939+gr_sockfamily_to_name(unsigned char family)
60940+{
60941+ return gr_sockfamilies[family];
60942+}
60943+
60944+int
60945+gr_search_socket(const int domain, const int type, const int protocol)
60946+{
60947+ struct acl_subject_label *curr;
60948+ const struct cred *cred = current_cred();
60949+
60950+ if (unlikely(!gr_acl_is_enabled()))
60951+ goto exit;
60952+
60953+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
60954+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
60955+ goto exit; // let the kernel handle it
60956+
60957+ curr = current->acl;
60958+
60959+ if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
60960+ /* the family is allowed, if this is PF_INET allow it only if
60961+ the extra sock type/protocol checks pass */
60962+ if (domain == PF_INET)
60963+ goto inet_check;
60964+ goto exit;
60965+ } else {
60966+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
60967+ __u32 fakeip = 0;
60968+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
60969+ current->role->roletype, cred->uid,
60970+ cred->gid, current->exec_file ?
60971+ gr_to_filename(current->exec_file->f_path.dentry,
60972+ current->exec_file->f_path.mnt) :
60973+ curr->filename, curr->filename,
60974+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
60975+ &current->signal->saved_ip);
60976+ goto exit;
60977+ }
60978+ goto exit_fail;
60979+ }
60980+
60981+inet_check:
60982+ /* the rest of this checking is for IPv4 only */
60983+ if (!curr->ips)
60984+ goto exit;
60985+
60986+ if ((curr->ip_type & (1 << type)) &&
60987+ (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
60988+ goto exit;
60989+
60990+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
60991+ /* we don't place acls on raw sockets , and sometimes
60992+ dgram/ip sockets are opened for ioctl and not
60993+ bind/connect, so we'll fake a bind learn log */
60994+ if (type == SOCK_RAW || type == SOCK_PACKET) {
60995+ __u32 fakeip = 0;
60996+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
60997+ current->role->roletype, cred->uid,
60998+ cred->gid, current->exec_file ?
60999+ gr_to_filename(current->exec_file->f_path.dentry,
61000+ current->exec_file->f_path.mnt) :
61001+ curr->filename, curr->filename,
61002+ &fakeip, 0, type,
61003+ protocol, GR_CONNECT, &current->signal->saved_ip);
61004+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
61005+ __u32 fakeip = 0;
61006+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
61007+ current->role->roletype, cred->uid,
61008+ cred->gid, current->exec_file ?
61009+ gr_to_filename(current->exec_file->f_path.dentry,
61010+ current->exec_file->f_path.mnt) :
61011+ curr->filename, curr->filename,
61012+ &fakeip, 0, type,
61013+ protocol, GR_BIND, &current->signal->saved_ip);
61014+ }
61015+ /* we'll log when they use connect or bind */
61016+ goto exit;
61017+ }
61018+
61019+exit_fail:
61020+ if (domain == PF_INET)
61021+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
61022+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
61023+ else
61024+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
61025+ gr_socktype_to_name(type), protocol);
61026+
61027+ return 0;
61028+exit:
61029+ return 1;
61030+}
61031+
61032+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)
61033+{
61034+ if ((ip->mode & mode) &&
61035+ (ip_port >= ip->low) &&
61036+ (ip_port <= ip->high) &&
61037+ ((ntohl(ip_addr) & our_netmask) ==
61038+ (ntohl(our_addr) & our_netmask))
61039+ && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
61040+ && (ip->type & (1 << type))) {
61041+ if (ip->mode & GR_INVERT)
61042+ return 2; // specifically denied
61043+ else
61044+ return 1; // allowed
61045+ }
61046+
61047+ return 0; // not specifically allowed, may continue parsing
61048+}
61049+
61050+static int
61051+gr_search_connectbind(const int full_mode, struct sock *sk,
61052+ struct sockaddr_in *addr, const int type)
61053+{
61054+ char iface[IFNAMSIZ] = {0};
61055+ struct acl_subject_label *curr;
61056+ struct acl_ip_label *ip;
61057+ struct inet_sock *isk;
61058+ struct net_device *dev;
61059+ struct in_device *idev;
61060+ unsigned long i;
61061+ int ret;
61062+ int mode = full_mode & (GR_BIND | GR_CONNECT);
61063+ __u32 ip_addr = 0;
61064+ __u32 our_addr;
61065+ __u32 our_netmask;
61066+ char *p;
61067+ __u16 ip_port = 0;
61068+ const struct cred *cred = current_cred();
61069+
61070+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
61071+ return 0;
61072+
61073+ curr = current->acl;
61074+ isk = inet_sk(sk);
61075+
61076+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
61077+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
61078+ addr->sin_addr.s_addr = curr->inaddr_any_override;
61079+ if ((full_mode & GR_CONNECT) && isk->saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
61080+ struct sockaddr_in saddr;
61081+ int err;
61082+
61083+ saddr.sin_family = AF_INET;
61084+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
61085+ saddr.sin_port = isk->sport;
61086+
61087+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
61088+ if (err)
61089+ return err;
61090+
61091+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
61092+ if (err)
61093+ return err;
61094+ }
61095+
61096+ if (!curr->ips)
61097+ return 0;
61098+
61099+ ip_addr = addr->sin_addr.s_addr;
61100+ ip_port = ntohs(addr->sin_port);
61101+
61102+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
61103+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
61104+ current->role->roletype, cred->uid,
61105+ cred->gid, current->exec_file ?
61106+ gr_to_filename(current->exec_file->f_path.dentry,
61107+ current->exec_file->f_path.mnt) :
61108+ curr->filename, curr->filename,
61109+ &ip_addr, ip_port, type,
61110+ sk->sk_protocol, mode, &current->signal->saved_ip);
61111+ return 0;
61112+ }
61113+
61114+ for (i = 0; i < curr->ip_num; i++) {
61115+ ip = *(curr->ips + i);
61116+ if (ip->iface != NULL) {
61117+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
61118+ p = strchr(iface, ':');
61119+ if (p != NULL)
61120+ *p = '\0';
61121+ dev = dev_get_by_name(sock_net(sk), iface);
61122+ if (dev == NULL)
61123+ continue;
61124+ idev = in_dev_get(dev);
61125+ if (idev == NULL) {
61126+ dev_put(dev);
61127+ continue;
61128+ }
61129+ rcu_read_lock();
61130+ for_ifa(idev) {
61131+ if (!strcmp(ip->iface, ifa->ifa_label)) {
61132+ our_addr = ifa->ifa_address;
61133+ our_netmask = 0xffffffff;
61134+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
61135+ if (ret == 1) {
61136+ rcu_read_unlock();
61137+ in_dev_put(idev);
61138+ dev_put(dev);
61139+ return 0;
61140+ } else if (ret == 2) {
61141+ rcu_read_unlock();
61142+ in_dev_put(idev);
61143+ dev_put(dev);
61144+ goto denied;
61145+ }
61146+ }
61147+ } endfor_ifa(idev);
61148+ rcu_read_unlock();
61149+ in_dev_put(idev);
61150+ dev_put(dev);
61151+ } else {
61152+ our_addr = ip->addr;
61153+ our_netmask = ip->netmask;
61154+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
61155+ if (ret == 1)
61156+ return 0;
61157+ else if (ret == 2)
61158+ goto denied;
61159+ }
61160+ }
61161+
61162+denied:
61163+ if (mode == GR_BIND)
61164+ 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));
61165+ else if (mode == GR_CONNECT)
61166+ 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));
61167+
61168+ return -EACCES;
61169+}
61170+
61171+int
61172+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
61173+{
61174+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
61175+}
61176+
61177+int
61178+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
61179+{
61180+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
61181+}
61182+
61183+int gr_search_listen(struct socket *sock)
61184+{
61185+ struct sock *sk = sock->sk;
61186+ struct sockaddr_in addr;
61187+
61188+ addr.sin_addr.s_addr = inet_sk(sk)->saddr;
61189+ addr.sin_port = inet_sk(sk)->sport;
61190+
61191+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
61192+}
61193+
61194+int gr_search_accept(struct socket *sock)
61195+{
61196+ struct sock *sk = sock->sk;
61197+ struct sockaddr_in addr;
61198+
61199+ addr.sin_addr.s_addr = inet_sk(sk)->saddr;
61200+ addr.sin_port = inet_sk(sk)->sport;
61201+
61202+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
61203+}
61204+
61205+int
61206+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
61207+{
61208+ if (addr)
61209+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
61210+ else {
61211+ struct sockaddr_in sin;
61212+ const struct inet_sock *inet = inet_sk(sk);
61213+
61214+ sin.sin_addr.s_addr = inet->daddr;
61215+ sin.sin_port = inet->dport;
61216+
61217+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
61218+ }
61219+}
61220+
61221+int
61222+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
61223+{
61224+ struct sockaddr_in sin;
61225+
61226+ if (unlikely(skb->len < sizeof (struct udphdr)))
61227+ return 0; // skip this packet
61228+
61229+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
61230+ sin.sin_port = udp_hdr(skb)->source;
61231+
61232+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
61233+}
61234diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
61235new file mode 100644
61236index 0000000..34bdd46
61237--- /dev/null
61238+++ b/grsecurity/gracl_learn.c
61239@@ -0,0 +1,208 @@
61240+#include <linux/kernel.h>
61241+#include <linux/mm.h>
61242+#include <linux/sched.h>
61243+#include <linux/poll.h>
61244+#include <linux/smp_lock.h>
61245+#include <linux/string.h>
61246+#include <linux/file.h>
61247+#include <linux/types.h>
61248+#include <linux/vmalloc.h>
61249+#include <linux/grinternal.h>
61250+
61251+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
61252+ size_t count, loff_t *ppos);
61253+extern int gr_acl_is_enabled(void);
61254+
61255+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
61256+static int gr_learn_attached;
61257+
61258+/* use a 512k buffer */
61259+#define LEARN_BUFFER_SIZE (512 * 1024)
61260+
61261+static DEFINE_SPINLOCK(gr_learn_lock);
61262+static DEFINE_MUTEX(gr_learn_user_mutex);
61263+
61264+/* we need to maintain two buffers, so that the kernel context of grlearn
61265+ uses a semaphore around the userspace copying, and the other kernel contexts
61266+ use a spinlock when copying into the buffer, since they cannot sleep
61267+*/
61268+static char *learn_buffer;
61269+static char *learn_buffer_user;
61270+static int learn_buffer_len;
61271+static int learn_buffer_user_len;
61272+
61273+static ssize_t
61274+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
61275+{
61276+ DECLARE_WAITQUEUE(wait, current);
61277+ ssize_t retval = 0;
61278+
61279+ add_wait_queue(&learn_wait, &wait);
61280+ set_current_state(TASK_INTERRUPTIBLE);
61281+ do {
61282+ mutex_lock(&gr_learn_user_mutex);
61283+ spin_lock(&gr_learn_lock);
61284+ if (learn_buffer_len)
61285+ break;
61286+ spin_unlock(&gr_learn_lock);
61287+ mutex_unlock(&gr_learn_user_mutex);
61288+ if (file->f_flags & O_NONBLOCK) {
61289+ retval = -EAGAIN;
61290+ goto out;
61291+ }
61292+ if (signal_pending(current)) {
61293+ retval = -ERESTARTSYS;
61294+ goto out;
61295+ }
61296+
61297+ schedule();
61298+ } while (1);
61299+
61300+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
61301+ learn_buffer_user_len = learn_buffer_len;
61302+ retval = learn_buffer_len;
61303+ learn_buffer_len = 0;
61304+
61305+ spin_unlock(&gr_learn_lock);
61306+
61307+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
61308+ retval = -EFAULT;
61309+
61310+ mutex_unlock(&gr_learn_user_mutex);
61311+out:
61312+ set_current_state(TASK_RUNNING);
61313+ remove_wait_queue(&learn_wait, &wait);
61314+ return retval;
61315+}
61316+
61317+static unsigned int
61318+poll_learn(struct file * file, poll_table * wait)
61319+{
61320+ poll_wait(file, &learn_wait, wait);
61321+
61322+ if (learn_buffer_len)
61323+ return (POLLIN | POLLRDNORM);
61324+
61325+ return 0;
61326+}
61327+
61328+void
61329+gr_clear_learn_entries(void)
61330+{
61331+ char *tmp;
61332+
61333+ mutex_lock(&gr_learn_user_mutex);
61334+ spin_lock(&gr_learn_lock);
61335+ tmp = learn_buffer;
61336+ learn_buffer = NULL;
61337+ spin_unlock(&gr_learn_lock);
61338+ if (tmp)
61339+ vfree(tmp);
61340+ if (learn_buffer_user != NULL) {
61341+ vfree(learn_buffer_user);
61342+ learn_buffer_user = NULL;
61343+ }
61344+ learn_buffer_len = 0;
61345+ mutex_unlock(&gr_learn_user_mutex);
61346+
61347+ return;
61348+}
61349+
61350+void
61351+gr_add_learn_entry(const char *fmt, ...)
61352+{
61353+ va_list args;
61354+ unsigned int len;
61355+
61356+ if (!gr_learn_attached)
61357+ return;
61358+
61359+ spin_lock(&gr_learn_lock);
61360+
61361+ /* leave a gap at the end so we know when it's "full" but don't have to
61362+ compute the exact length of the string we're trying to append
61363+ */
61364+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
61365+ spin_unlock(&gr_learn_lock);
61366+ wake_up_interruptible(&learn_wait);
61367+ return;
61368+ }
61369+ if (learn_buffer == NULL) {
61370+ spin_unlock(&gr_learn_lock);
61371+ return;
61372+ }
61373+
61374+ va_start(args, fmt);
61375+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
61376+ va_end(args);
61377+
61378+ learn_buffer_len += len + 1;
61379+
61380+ spin_unlock(&gr_learn_lock);
61381+ wake_up_interruptible(&learn_wait);
61382+
61383+ return;
61384+}
61385+
61386+static int
61387+open_learn(struct inode *inode, struct file *file)
61388+{
61389+ if (file->f_mode & FMODE_READ && gr_learn_attached)
61390+ return -EBUSY;
61391+ if (file->f_mode & FMODE_READ) {
61392+ int retval = 0;
61393+ mutex_lock(&gr_learn_user_mutex);
61394+ if (learn_buffer == NULL)
61395+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
61396+ if (learn_buffer_user == NULL)
61397+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
61398+ if (learn_buffer == NULL) {
61399+ retval = -ENOMEM;
61400+ goto out_error;
61401+ }
61402+ if (learn_buffer_user == NULL) {
61403+ retval = -ENOMEM;
61404+ goto out_error;
61405+ }
61406+ learn_buffer_len = 0;
61407+ learn_buffer_user_len = 0;
61408+ gr_learn_attached = 1;
61409+out_error:
61410+ mutex_unlock(&gr_learn_user_mutex);
61411+ return retval;
61412+ }
61413+ return 0;
61414+}
61415+
61416+static int
61417+close_learn(struct inode *inode, struct file *file)
61418+{
61419+ if (file->f_mode & FMODE_READ) {
61420+ char *tmp = NULL;
61421+ mutex_lock(&gr_learn_user_mutex);
61422+ spin_lock(&gr_learn_lock);
61423+ tmp = learn_buffer;
61424+ learn_buffer = NULL;
61425+ spin_unlock(&gr_learn_lock);
61426+ if (tmp)
61427+ vfree(tmp);
61428+ if (learn_buffer_user != NULL) {
61429+ vfree(learn_buffer_user);
61430+ learn_buffer_user = NULL;
61431+ }
61432+ learn_buffer_len = 0;
61433+ learn_buffer_user_len = 0;
61434+ gr_learn_attached = 0;
61435+ mutex_unlock(&gr_learn_user_mutex);
61436+ }
61437+
61438+ return 0;
61439+}
61440+
61441+const struct file_operations grsec_fops = {
61442+ .read = read_learn,
61443+ .write = write_grsec_handler,
61444+ .open = open_learn,
61445+ .release = close_learn,
61446+ .poll = poll_learn,
61447+};
61448diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
61449new file mode 100644
61450index 0000000..70b2179
61451--- /dev/null
61452+++ b/grsecurity/gracl_res.c
61453@@ -0,0 +1,67 @@
61454+#include <linux/kernel.h>
61455+#include <linux/sched.h>
61456+#include <linux/gracl.h>
61457+#include <linux/grinternal.h>
61458+
61459+static const char *restab_log[] = {
61460+ [RLIMIT_CPU] = "RLIMIT_CPU",
61461+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
61462+ [RLIMIT_DATA] = "RLIMIT_DATA",
61463+ [RLIMIT_STACK] = "RLIMIT_STACK",
61464+ [RLIMIT_CORE] = "RLIMIT_CORE",
61465+ [RLIMIT_RSS] = "RLIMIT_RSS",
61466+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
61467+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
61468+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
61469+ [RLIMIT_AS] = "RLIMIT_AS",
61470+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
61471+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
61472+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
61473+ [RLIMIT_NICE] = "RLIMIT_NICE",
61474+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
61475+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
61476+ [GR_CRASH_RES] = "RLIMIT_CRASH"
61477+};
61478+
61479+void
61480+gr_log_resource(const struct task_struct *task,
61481+ const int res, const unsigned long wanted, const int gt)
61482+{
61483+ const struct cred *cred;
61484+ unsigned long rlim;
61485+
61486+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
61487+ return;
61488+
61489+ // not yet supported resource
61490+ if (unlikely(!restab_log[res]))
61491+ return;
61492+
61493+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
61494+ rlim = task->signal->rlim[res].rlim_max;
61495+ else
61496+ rlim = task->signal->rlim[res].rlim_cur;
61497+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
61498+ return;
61499+
61500+ rcu_read_lock();
61501+ cred = __task_cred(task);
61502+
61503+ if (res == RLIMIT_NPROC &&
61504+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
61505+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
61506+ goto out_rcu_unlock;
61507+ else if (res == RLIMIT_MEMLOCK &&
61508+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
61509+ goto out_rcu_unlock;
61510+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
61511+ goto out_rcu_unlock;
61512+ rcu_read_unlock();
61513+
61514+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
61515+
61516+ return;
61517+out_rcu_unlock:
61518+ rcu_read_unlock();
61519+ return;
61520+}
61521diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
61522new file mode 100644
61523index 0000000..1d1b734
61524--- /dev/null
61525+++ b/grsecurity/gracl_segv.c
61526@@ -0,0 +1,284 @@
61527+#include <linux/kernel.h>
61528+#include <linux/mm.h>
61529+#include <asm/uaccess.h>
61530+#include <asm/errno.h>
61531+#include <asm/mman.h>
61532+#include <net/sock.h>
61533+#include <linux/file.h>
61534+#include <linux/fs.h>
61535+#include <linux/net.h>
61536+#include <linux/in.h>
61537+#include <linux/smp_lock.h>
61538+#include <linux/slab.h>
61539+#include <linux/types.h>
61540+#include <linux/sched.h>
61541+#include <linux/timer.h>
61542+#include <linux/gracl.h>
61543+#include <linux/grsecurity.h>
61544+#include <linux/grinternal.h>
61545+
61546+static struct crash_uid *uid_set;
61547+static unsigned short uid_used;
61548+static DEFINE_SPINLOCK(gr_uid_lock);
61549+extern rwlock_t gr_inode_lock;
61550+extern struct acl_subject_label *
61551+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
61552+ struct acl_role_label *role);
61553+extern int gr_fake_force_sig(int sig, struct task_struct *t);
61554+
61555+int
61556+gr_init_uidset(void)
61557+{
61558+ uid_set =
61559+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
61560+ uid_used = 0;
61561+
61562+ return uid_set ? 1 : 0;
61563+}
61564+
61565+void
61566+gr_free_uidset(void)
61567+{
61568+ if (uid_set)
61569+ kfree(uid_set);
61570+
61571+ return;
61572+}
61573+
61574+int
61575+gr_find_uid(const uid_t uid)
61576+{
61577+ struct crash_uid *tmp = uid_set;
61578+ uid_t buid;
61579+ int low = 0, high = uid_used - 1, mid;
61580+
61581+ while (high >= low) {
61582+ mid = (low + high) >> 1;
61583+ buid = tmp[mid].uid;
61584+ if (buid == uid)
61585+ return mid;
61586+ if (buid > uid)
61587+ high = mid - 1;
61588+ if (buid < uid)
61589+ low = mid + 1;
61590+ }
61591+
61592+ return -1;
61593+}
61594+
61595+static __inline__ void
61596+gr_insertsort(void)
61597+{
61598+ unsigned short i, j;
61599+ struct crash_uid index;
61600+
61601+ for (i = 1; i < uid_used; i++) {
61602+ index = uid_set[i];
61603+ j = i;
61604+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
61605+ uid_set[j] = uid_set[j - 1];
61606+ j--;
61607+ }
61608+ uid_set[j] = index;
61609+ }
61610+
61611+ return;
61612+}
61613+
61614+static __inline__ void
61615+gr_insert_uid(const uid_t uid, const unsigned long expires)
61616+{
61617+ int loc;
61618+
61619+ if (uid_used == GR_UIDTABLE_MAX)
61620+ return;
61621+
61622+ loc = gr_find_uid(uid);
61623+
61624+ if (loc >= 0) {
61625+ uid_set[loc].expires = expires;
61626+ return;
61627+ }
61628+
61629+ uid_set[uid_used].uid = uid;
61630+ uid_set[uid_used].expires = expires;
61631+ uid_used++;
61632+
61633+ gr_insertsort();
61634+
61635+ return;
61636+}
61637+
61638+void
61639+gr_remove_uid(const unsigned short loc)
61640+{
61641+ unsigned short i;
61642+
61643+ for (i = loc + 1; i < uid_used; i++)
61644+ uid_set[i - 1] = uid_set[i];
61645+
61646+ uid_used--;
61647+
61648+ return;
61649+}
61650+
61651+int
61652+gr_check_crash_uid(const uid_t uid)
61653+{
61654+ int loc;
61655+ int ret = 0;
61656+
61657+ if (unlikely(!gr_acl_is_enabled()))
61658+ return 0;
61659+
61660+ spin_lock(&gr_uid_lock);
61661+ loc = gr_find_uid(uid);
61662+
61663+ if (loc < 0)
61664+ goto out_unlock;
61665+
61666+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
61667+ gr_remove_uid(loc);
61668+ else
61669+ ret = 1;
61670+
61671+out_unlock:
61672+ spin_unlock(&gr_uid_lock);
61673+ return ret;
61674+}
61675+
61676+static __inline__ int
61677+proc_is_setxid(const struct cred *cred)
61678+{
61679+ if (cred->uid != cred->euid || cred->uid != cred->suid ||
61680+ cred->uid != cred->fsuid)
61681+ return 1;
61682+ if (cred->gid != cred->egid || cred->gid != cred->sgid ||
61683+ cred->gid != cred->fsgid)
61684+ return 1;
61685+
61686+ return 0;
61687+}
61688+
61689+void
61690+gr_handle_crash(struct task_struct *task, const int sig)
61691+{
61692+ struct acl_subject_label *curr;
61693+ struct task_struct *tsk, *tsk2;
61694+ const struct cred *cred;
61695+ const struct cred *cred2;
61696+
61697+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
61698+ return;
61699+
61700+ if (unlikely(!gr_acl_is_enabled()))
61701+ return;
61702+
61703+ curr = task->acl;
61704+
61705+ if (!(curr->resmask & (1 << GR_CRASH_RES)))
61706+ return;
61707+
61708+ if (time_before_eq(curr->expires, get_seconds())) {
61709+ curr->expires = 0;
61710+ curr->crashes = 0;
61711+ }
61712+
61713+ curr->crashes++;
61714+
61715+ if (!curr->expires)
61716+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
61717+
61718+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
61719+ time_after(curr->expires, get_seconds())) {
61720+ rcu_read_lock();
61721+ cred = __task_cred(task);
61722+ if (cred->uid && proc_is_setxid(cred)) {
61723+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
61724+ spin_lock(&gr_uid_lock);
61725+ gr_insert_uid(cred->uid, curr->expires);
61726+ spin_unlock(&gr_uid_lock);
61727+ curr->expires = 0;
61728+ curr->crashes = 0;
61729+ read_lock(&tasklist_lock);
61730+ do_each_thread(tsk2, tsk) {
61731+ cred2 = __task_cred(tsk);
61732+ if (tsk != task && cred2->uid == cred->uid)
61733+ gr_fake_force_sig(SIGKILL, tsk);
61734+ } while_each_thread(tsk2, tsk);
61735+ read_unlock(&tasklist_lock);
61736+ } else {
61737+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
61738+ read_lock(&tasklist_lock);
61739+ read_lock(&grsec_exec_file_lock);
61740+ do_each_thread(tsk2, tsk) {
61741+ if (likely(tsk != task)) {
61742+ // if this thread has the same subject as the one that triggered
61743+ // RES_CRASH and it's the same binary, kill it
61744+ if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
61745+ gr_fake_force_sig(SIGKILL, tsk);
61746+ }
61747+ } while_each_thread(tsk2, tsk);
61748+ read_unlock(&grsec_exec_file_lock);
61749+ read_unlock(&tasklist_lock);
61750+ }
61751+ rcu_read_unlock();
61752+ }
61753+
61754+ return;
61755+}
61756+
61757+int
61758+gr_check_crash_exec(const struct file *filp)
61759+{
61760+ struct acl_subject_label *curr;
61761+
61762+ if (unlikely(!gr_acl_is_enabled()))
61763+ return 0;
61764+
61765+ read_lock(&gr_inode_lock);
61766+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
61767+ filp->f_path.dentry->d_inode->i_sb->s_dev,
61768+ current->role);
61769+ read_unlock(&gr_inode_lock);
61770+
61771+ if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
61772+ (!curr->crashes && !curr->expires))
61773+ return 0;
61774+
61775+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
61776+ time_after(curr->expires, get_seconds()))
61777+ return 1;
61778+ else if (time_before_eq(curr->expires, get_seconds())) {
61779+ curr->crashes = 0;
61780+ curr->expires = 0;
61781+ }
61782+
61783+ return 0;
61784+}
61785+
61786+void
61787+gr_handle_alertkill(struct task_struct *task)
61788+{
61789+ struct acl_subject_label *curracl;
61790+ __u32 curr_ip;
61791+ struct task_struct *p, *p2;
61792+
61793+ if (unlikely(!gr_acl_is_enabled()))
61794+ return;
61795+
61796+ curracl = task->acl;
61797+ curr_ip = task->signal->curr_ip;
61798+
61799+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
61800+ read_lock(&tasklist_lock);
61801+ do_each_thread(p2, p) {
61802+ if (p->signal->curr_ip == curr_ip)
61803+ gr_fake_force_sig(SIGKILL, p);
61804+ } while_each_thread(p2, p);
61805+ read_unlock(&tasklist_lock);
61806+ } else if (curracl->mode & GR_KILLPROC)
61807+ gr_fake_force_sig(SIGKILL, task);
61808+
61809+ return;
61810+}
61811diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
61812new file mode 100644
61813index 0000000..9d83a69
61814--- /dev/null
61815+++ b/grsecurity/gracl_shm.c
61816@@ -0,0 +1,40 @@
61817+#include <linux/kernel.h>
61818+#include <linux/mm.h>
61819+#include <linux/sched.h>
61820+#include <linux/file.h>
61821+#include <linux/ipc.h>
61822+#include <linux/gracl.h>
61823+#include <linux/grsecurity.h>
61824+#include <linux/grinternal.h>
61825+
61826+int
61827+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
61828+ const time_t shm_createtime, const uid_t cuid, const int shmid)
61829+{
61830+ struct task_struct *task;
61831+
61832+ if (!gr_acl_is_enabled())
61833+ return 1;
61834+
61835+ rcu_read_lock();
61836+ read_lock(&tasklist_lock);
61837+
61838+ task = find_task_by_vpid(shm_cprid);
61839+
61840+ if (unlikely(!task))
61841+ task = find_task_by_vpid(shm_lapid);
61842+
61843+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
61844+ (task->pid == shm_lapid)) &&
61845+ (task->acl->mode & GR_PROTSHM) &&
61846+ (task->acl != current->acl))) {
61847+ read_unlock(&tasklist_lock);
61848+ rcu_read_unlock();
61849+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
61850+ return 0;
61851+ }
61852+ read_unlock(&tasklist_lock);
61853+ rcu_read_unlock();
61854+
61855+ return 1;
61856+}
61857diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
61858new file mode 100644
61859index 0000000..bc0be01
61860--- /dev/null
61861+++ b/grsecurity/grsec_chdir.c
61862@@ -0,0 +1,19 @@
61863+#include <linux/kernel.h>
61864+#include <linux/sched.h>
61865+#include <linux/fs.h>
61866+#include <linux/file.h>
61867+#include <linux/grsecurity.h>
61868+#include <linux/grinternal.h>
61869+
61870+void
61871+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
61872+{
61873+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
61874+ if ((grsec_enable_chdir && grsec_enable_group &&
61875+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
61876+ !grsec_enable_group)) {
61877+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
61878+ }
61879+#endif
61880+ return;
61881+}
61882diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
61883new file mode 100644
61884index 0000000..197bdd5
61885--- /dev/null
61886+++ b/grsecurity/grsec_chroot.c
61887@@ -0,0 +1,386 @@
61888+#include <linux/kernel.h>
61889+#include <linux/module.h>
61890+#include <linux/sched.h>
61891+#include <linux/file.h>
61892+#include <linux/fs.h>
61893+#include <linux/mount.h>
61894+#include <linux/types.h>
61895+#include <linux/pid_namespace.h>
61896+#include <linux/grsecurity.h>
61897+#include <linux/grinternal.h>
61898+
61899+void gr_set_chroot_entries(struct task_struct *task, struct path *path)
61900+{
61901+#ifdef CONFIG_GRKERNSEC
61902+ if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
61903+ path->dentry != task->nsproxy->mnt_ns->root->mnt_root)
61904+ task->gr_is_chrooted = 1;
61905+ else
61906+ task->gr_is_chrooted = 0;
61907+
61908+ task->gr_chroot_dentry = path->dentry;
61909+#endif
61910+ return;
61911+}
61912+
61913+void gr_clear_chroot_entries(struct task_struct *task)
61914+{
61915+#ifdef CONFIG_GRKERNSEC
61916+ task->gr_is_chrooted = 0;
61917+ task->gr_chroot_dentry = NULL;
61918+#endif
61919+ return;
61920+}
61921+
61922+int
61923+gr_handle_chroot_unix(const pid_t pid)
61924+{
61925+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
61926+ struct task_struct *p;
61927+
61928+ if (unlikely(!grsec_enable_chroot_unix))
61929+ return 1;
61930+
61931+ if (likely(!proc_is_chrooted(current)))
61932+ return 1;
61933+
61934+ rcu_read_lock();
61935+ read_lock(&tasklist_lock);
61936+
61937+ p = find_task_by_vpid_unrestricted(pid);
61938+ if (unlikely(p && !have_same_root(current, p))) {
61939+ read_unlock(&tasklist_lock);
61940+ rcu_read_unlock();
61941+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
61942+ return 0;
61943+ }
61944+ read_unlock(&tasklist_lock);
61945+ rcu_read_unlock();
61946+#endif
61947+ return 1;
61948+}
61949+
61950+int
61951+gr_handle_chroot_nice(void)
61952+{
61953+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
61954+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
61955+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
61956+ return -EPERM;
61957+ }
61958+#endif
61959+ return 0;
61960+}
61961+
61962+int
61963+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
61964+{
61965+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
61966+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
61967+ && proc_is_chrooted(current)) {
61968+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
61969+ return -EACCES;
61970+ }
61971+#endif
61972+ return 0;
61973+}
61974+
61975+int
61976+gr_handle_chroot_rawio(const struct inode *inode)
61977+{
61978+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
61979+ if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
61980+ inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
61981+ return 1;
61982+#endif
61983+ return 0;
61984+}
61985+
61986+int
61987+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
61988+{
61989+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
61990+ struct task_struct *p;
61991+ int ret = 0;
61992+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
61993+ return ret;
61994+
61995+ read_lock(&tasklist_lock);
61996+ do_each_pid_task(pid, type, p) {
61997+ if (!have_same_root(current, p)) {
61998+ ret = 1;
61999+ goto out;
62000+ }
62001+ } while_each_pid_task(pid, type, p);
62002+out:
62003+ read_unlock(&tasklist_lock);
62004+ return ret;
62005+#endif
62006+ return 0;
62007+}
62008+
62009+int
62010+gr_pid_is_chrooted(struct task_struct *p)
62011+{
62012+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
62013+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
62014+ return 0;
62015+
62016+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
62017+ !have_same_root(current, p)) {
62018+ return 1;
62019+ }
62020+#endif
62021+ return 0;
62022+}
62023+
62024+EXPORT_SYMBOL(gr_pid_is_chrooted);
62025+
62026+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
62027+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
62028+{
62029+ struct dentry *dentry = (struct dentry *)u_dentry;
62030+ struct vfsmount *mnt = (struct vfsmount *)u_mnt;
62031+ struct dentry *realroot;
62032+ struct vfsmount *realrootmnt;
62033+ struct dentry *currentroot;
62034+ struct vfsmount *currentmnt;
62035+ struct task_struct *reaper = &init_task;
62036+ int ret = 1;
62037+
62038+ read_lock(&reaper->fs->lock);
62039+ realrootmnt = mntget(reaper->fs->root.mnt);
62040+ realroot = dget(reaper->fs->root.dentry);
62041+ read_unlock(&reaper->fs->lock);
62042+
62043+ read_lock(&current->fs->lock);
62044+ currentmnt = mntget(current->fs->root.mnt);
62045+ currentroot = dget(current->fs->root.dentry);
62046+ read_unlock(&current->fs->lock);
62047+
62048+ spin_lock(&dcache_lock);
62049+ for (;;) {
62050+ if (unlikely((dentry == realroot && mnt == realrootmnt)
62051+ || (dentry == currentroot && mnt == currentmnt)))
62052+ break;
62053+ if (unlikely(dentry == mnt->mnt_root || IS_ROOT(dentry))) {
62054+ if (mnt->mnt_parent == mnt)
62055+ break;
62056+ dentry = mnt->mnt_mountpoint;
62057+ mnt = mnt->mnt_parent;
62058+ continue;
62059+ }
62060+ dentry = dentry->d_parent;
62061+ }
62062+ spin_unlock(&dcache_lock);
62063+
62064+ dput(currentroot);
62065+ mntput(currentmnt);
62066+
62067+ /* access is outside of chroot */
62068+ if (dentry == realroot && mnt == realrootmnt)
62069+ ret = 0;
62070+
62071+ dput(realroot);
62072+ mntput(realrootmnt);
62073+ return ret;
62074+}
62075+#endif
62076+
62077+int
62078+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
62079+{
62080+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
62081+ if (!grsec_enable_chroot_fchdir)
62082+ return 1;
62083+
62084+ if (!proc_is_chrooted(current))
62085+ return 1;
62086+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
62087+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
62088+ return 0;
62089+ }
62090+#endif
62091+ return 1;
62092+}
62093+
62094+int
62095+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
62096+ const time_t shm_createtime)
62097+{
62098+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
62099+ struct task_struct *p;
62100+ time_t starttime;
62101+
62102+ if (unlikely(!grsec_enable_chroot_shmat))
62103+ return 1;
62104+
62105+ if (likely(!proc_is_chrooted(current)))
62106+ return 1;
62107+
62108+ rcu_read_lock();
62109+ read_lock(&tasklist_lock);
62110+
62111+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
62112+ starttime = p->start_time.tv_sec;
62113+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
62114+ if (have_same_root(current, p)) {
62115+ goto allow;
62116+ } else {
62117+ read_unlock(&tasklist_lock);
62118+ rcu_read_unlock();
62119+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
62120+ return 0;
62121+ }
62122+ }
62123+ /* creator exited, pid reuse, fall through to next check */
62124+ }
62125+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
62126+ if (unlikely(!have_same_root(current, p))) {
62127+ read_unlock(&tasklist_lock);
62128+ rcu_read_unlock();
62129+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
62130+ return 0;
62131+ }
62132+ }
62133+
62134+allow:
62135+ read_unlock(&tasklist_lock);
62136+ rcu_read_unlock();
62137+#endif
62138+ return 1;
62139+}
62140+
62141+void
62142+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
62143+{
62144+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
62145+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
62146+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
62147+#endif
62148+ return;
62149+}
62150+
62151+int
62152+gr_handle_chroot_mknod(const struct dentry *dentry,
62153+ const struct vfsmount *mnt, const int mode)
62154+{
62155+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
62156+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
62157+ proc_is_chrooted(current)) {
62158+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
62159+ return -EPERM;
62160+ }
62161+#endif
62162+ return 0;
62163+}
62164+
62165+int
62166+gr_handle_chroot_mount(const struct dentry *dentry,
62167+ const struct vfsmount *mnt, const char *dev_name)
62168+{
62169+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
62170+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
62171+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none" , dentry, mnt);
62172+ return -EPERM;
62173+ }
62174+#endif
62175+ return 0;
62176+}
62177+
62178+int
62179+gr_handle_chroot_pivot(void)
62180+{
62181+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
62182+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
62183+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
62184+ return -EPERM;
62185+ }
62186+#endif
62187+ return 0;
62188+}
62189+
62190+int
62191+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
62192+{
62193+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
62194+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
62195+ !gr_is_outside_chroot(dentry, mnt)) {
62196+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
62197+ return -EPERM;
62198+ }
62199+#endif
62200+ return 0;
62201+}
62202+
62203+extern const char *captab_log[];
62204+extern int captab_log_entries;
62205+
62206+int
62207+gr_chroot_is_capable(const int cap)
62208+{
62209+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
62210+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
62211+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
62212+ if (cap_raised(chroot_caps, cap)) {
62213+ const struct cred *creds = current_cred();
62214+ if (cap_raised(creds->cap_effective, cap) && cap < captab_log_entries) {
62215+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, current, captab_log[cap]);
62216+ }
62217+ return 0;
62218+ }
62219+ }
62220+#endif
62221+ return 1;
62222+}
62223+
62224+int
62225+gr_chroot_is_capable_nolog(const int cap)
62226+{
62227+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
62228+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
62229+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
62230+ if (cap_raised(chroot_caps, cap)) {
62231+ return 0;
62232+ }
62233+ }
62234+#endif
62235+ return 1;
62236+}
62237+
62238+int
62239+gr_handle_chroot_sysctl(const int op)
62240+{
62241+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
62242+ if (grsec_enable_chroot_sysctl && proc_is_chrooted(current)
62243+ && (op & MAY_WRITE))
62244+ return -EACCES;
62245+#endif
62246+ return 0;
62247+}
62248+
62249+void
62250+gr_handle_chroot_chdir(struct path *path)
62251+{
62252+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
62253+ if (grsec_enable_chroot_chdir)
62254+ set_fs_pwd(current->fs, path);
62255+#endif
62256+ return;
62257+}
62258+
62259+int
62260+gr_handle_chroot_chmod(const struct dentry *dentry,
62261+ const struct vfsmount *mnt, const int mode)
62262+{
62263+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
62264+ /* allow chmod +s on directories, but not on files */
62265+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
62266+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
62267+ proc_is_chrooted(current)) {
62268+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
62269+ return -EPERM;
62270+ }
62271+#endif
62272+ return 0;
62273+}
62274diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
62275new file mode 100644
62276index 0000000..b81db5b
62277--- /dev/null
62278+++ b/grsecurity/grsec_disabled.c
62279@@ -0,0 +1,439 @@
62280+#include <linux/kernel.h>
62281+#include <linux/module.h>
62282+#include <linux/sched.h>
62283+#include <linux/file.h>
62284+#include <linux/fs.h>
62285+#include <linux/kdev_t.h>
62286+#include <linux/net.h>
62287+#include <linux/in.h>
62288+#include <linux/ip.h>
62289+#include <linux/skbuff.h>
62290+#include <linux/sysctl.h>
62291+
62292+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
62293+void
62294+pax_set_initial_flags(struct linux_binprm *bprm)
62295+{
62296+ return;
62297+}
62298+#endif
62299+
62300+#ifdef CONFIG_SYSCTL
62301+__u32
62302+gr_handle_sysctl(const struct ctl_table * table, const int op)
62303+{
62304+ return 0;
62305+}
62306+#endif
62307+
62308+#ifdef CONFIG_TASKSTATS
62309+int gr_is_taskstats_denied(int pid)
62310+{
62311+ return 0;
62312+}
62313+#endif
62314+
62315+int
62316+gr_acl_is_enabled(void)
62317+{
62318+ return 0;
62319+}
62320+
62321+void
62322+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
62323+{
62324+ return;
62325+}
62326+
62327+int
62328+gr_handle_rawio(const struct inode *inode)
62329+{
62330+ return 0;
62331+}
62332+
62333+void
62334+gr_acl_handle_psacct(struct task_struct *task, const long code)
62335+{
62336+ return;
62337+}
62338+
62339+int
62340+gr_handle_ptrace(struct task_struct *task, const long request)
62341+{
62342+ return 0;
62343+}
62344+
62345+int
62346+gr_handle_proc_ptrace(struct task_struct *task)
62347+{
62348+ return 0;
62349+}
62350+
62351+void
62352+gr_learn_resource(const struct task_struct *task,
62353+ const int res, const unsigned long wanted, const int gt)
62354+{
62355+ return;
62356+}
62357+
62358+int
62359+gr_set_acls(const int type)
62360+{
62361+ return 0;
62362+}
62363+
62364+int
62365+gr_check_hidden_task(const struct task_struct *tsk)
62366+{
62367+ return 0;
62368+}
62369+
62370+int
62371+gr_check_protected_task(const struct task_struct *task)
62372+{
62373+ return 0;
62374+}
62375+
62376+int
62377+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
62378+{
62379+ return 0;
62380+}
62381+
62382+void
62383+gr_copy_label(struct task_struct *tsk)
62384+{
62385+ return;
62386+}
62387+
62388+void
62389+gr_set_pax_flags(struct task_struct *task)
62390+{
62391+ return;
62392+}
62393+
62394+int
62395+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
62396+ const int unsafe_share)
62397+{
62398+ return 0;
62399+}
62400+
62401+void
62402+gr_handle_delete(const ino_t ino, const dev_t dev)
62403+{
62404+ return;
62405+}
62406+
62407+void
62408+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
62409+{
62410+ return;
62411+}
62412+
62413+void
62414+gr_handle_crash(struct task_struct *task, const int sig)
62415+{
62416+ return;
62417+}
62418+
62419+int
62420+gr_check_crash_exec(const struct file *filp)
62421+{
62422+ return 0;
62423+}
62424+
62425+int
62426+gr_check_crash_uid(const uid_t uid)
62427+{
62428+ return 0;
62429+}
62430+
62431+void
62432+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
62433+ struct dentry *old_dentry,
62434+ struct dentry *new_dentry,
62435+ struct vfsmount *mnt, const __u8 replace)
62436+{
62437+ return;
62438+}
62439+
62440+int
62441+gr_search_socket(const int family, const int type, const int protocol)
62442+{
62443+ return 1;
62444+}
62445+
62446+int
62447+gr_search_connectbind(const int mode, const struct socket *sock,
62448+ const struct sockaddr_in *addr)
62449+{
62450+ return 0;
62451+}
62452+
62453+void
62454+gr_handle_alertkill(struct task_struct *task)
62455+{
62456+ return;
62457+}
62458+
62459+__u32
62460+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
62461+{
62462+ return 1;
62463+}
62464+
62465+__u32
62466+gr_acl_handle_hidden_file(const struct dentry * dentry,
62467+ const struct vfsmount * mnt)
62468+{
62469+ return 1;
62470+}
62471+
62472+__u32
62473+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
62474+ int acc_mode)
62475+{
62476+ return 1;
62477+}
62478+
62479+__u32
62480+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
62481+{
62482+ return 1;
62483+}
62484+
62485+__u32
62486+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
62487+{
62488+ return 1;
62489+}
62490+
62491+int
62492+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
62493+ unsigned int *vm_flags)
62494+{
62495+ return 1;
62496+}
62497+
62498+__u32
62499+gr_acl_handle_truncate(const struct dentry * dentry,
62500+ const struct vfsmount * mnt)
62501+{
62502+ return 1;
62503+}
62504+
62505+__u32
62506+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
62507+{
62508+ return 1;
62509+}
62510+
62511+__u32
62512+gr_acl_handle_access(const struct dentry * dentry,
62513+ const struct vfsmount * mnt, const int fmode)
62514+{
62515+ return 1;
62516+}
62517+
62518+__u32
62519+gr_acl_handle_fchmod(const struct dentry * dentry, const struct vfsmount * mnt,
62520+ mode_t mode)
62521+{
62522+ return 1;
62523+}
62524+
62525+__u32
62526+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
62527+ mode_t mode)
62528+{
62529+ return 1;
62530+}
62531+
62532+__u32
62533+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
62534+{
62535+ return 1;
62536+}
62537+
62538+__u32
62539+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
62540+{
62541+ return 1;
62542+}
62543+
62544+void
62545+grsecurity_init(void)
62546+{
62547+ return;
62548+}
62549+
62550+__u32
62551+gr_acl_handle_mknod(const struct dentry * new_dentry,
62552+ const struct dentry * parent_dentry,
62553+ const struct vfsmount * parent_mnt,
62554+ const int mode)
62555+{
62556+ return 1;
62557+}
62558+
62559+__u32
62560+gr_acl_handle_mkdir(const struct dentry * new_dentry,
62561+ const struct dentry * parent_dentry,
62562+ const struct vfsmount * parent_mnt)
62563+{
62564+ return 1;
62565+}
62566+
62567+__u32
62568+gr_acl_handle_symlink(const struct dentry * new_dentry,
62569+ const struct dentry * parent_dentry,
62570+ const struct vfsmount * parent_mnt, const char *from)
62571+{
62572+ return 1;
62573+}
62574+
62575+__u32
62576+gr_acl_handle_link(const struct dentry * new_dentry,
62577+ const struct dentry * parent_dentry,
62578+ const struct vfsmount * parent_mnt,
62579+ const struct dentry * old_dentry,
62580+ const struct vfsmount * old_mnt, const char *to)
62581+{
62582+ return 1;
62583+}
62584+
62585+int
62586+gr_acl_handle_rename(const struct dentry *new_dentry,
62587+ const struct dentry *parent_dentry,
62588+ const struct vfsmount *parent_mnt,
62589+ const struct dentry *old_dentry,
62590+ const struct inode *old_parent_inode,
62591+ const struct vfsmount *old_mnt, const char *newname)
62592+{
62593+ return 0;
62594+}
62595+
62596+int
62597+gr_acl_handle_filldir(const struct file *file, const char *name,
62598+ const int namelen, const ino_t ino)
62599+{
62600+ return 1;
62601+}
62602+
62603+int
62604+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
62605+ const time_t shm_createtime, const uid_t cuid, const int shmid)
62606+{
62607+ return 1;
62608+}
62609+
62610+int
62611+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
62612+{
62613+ return 0;
62614+}
62615+
62616+int
62617+gr_search_accept(const struct socket *sock)
62618+{
62619+ return 0;
62620+}
62621+
62622+int
62623+gr_search_listen(const struct socket *sock)
62624+{
62625+ return 0;
62626+}
62627+
62628+int
62629+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
62630+{
62631+ return 0;
62632+}
62633+
62634+__u32
62635+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
62636+{
62637+ return 1;
62638+}
62639+
62640+__u32
62641+gr_acl_handle_creat(const struct dentry * dentry,
62642+ const struct dentry * p_dentry,
62643+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
62644+ const int imode)
62645+{
62646+ return 1;
62647+}
62648+
62649+void
62650+gr_acl_handle_exit(void)
62651+{
62652+ return;
62653+}
62654+
62655+int
62656+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
62657+{
62658+ return 1;
62659+}
62660+
62661+void
62662+gr_set_role_label(const uid_t uid, const gid_t gid)
62663+{
62664+ return;
62665+}
62666+
62667+int
62668+gr_acl_handle_procpidmem(const struct task_struct *task)
62669+{
62670+ return 0;
62671+}
62672+
62673+int
62674+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
62675+{
62676+ return 0;
62677+}
62678+
62679+int
62680+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
62681+{
62682+ return 0;
62683+}
62684+
62685+void
62686+gr_set_kernel_label(struct task_struct *task)
62687+{
62688+ return;
62689+}
62690+
62691+int
62692+gr_check_user_change(int real, int effective, int fs)
62693+{
62694+ return 0;
62695+}
62696+
62697+int
62698+gr_check_group_change(int real, int effective, int fs)
62699+{
62700+ return 0;
62701+}
62702+
62703+int gr_acl_enable_at_secure(void)
62704+{
62705+ return 0;
62706+}
62707+
62708+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
62709+{
62710+ return dentry->d_inode->i_sb->s_dev;
62711+}
62712+
62713+EXPORT_SYMBOL(gr_learn_resource);
62714+EXPORT_SYMBOL(gr_set_kernel_label);
62715+#ifdef CONFIG_SECURITY
62716+EXPORT_SYMBOL(gr_check_user_change);
62717+EXPORT_SYMBOL(gr_check_group_change);
62718+#endif
62719diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
62720new file mode 100644
62721index 0000000..a96e155
62722--- /dev/null
62723+++ b/grsecurity/grsec_exec.c
62724@@ -0,0 +1,204 @@
62725+#include <linux/kernel.h>
62726+#include <linux/sched.h>
62727+#include <linux/file.h>
62728+#include <linux/binfmts.h>
62729+#include <linux/smp_lock.h>
62730+#include <linux/fs.h>
62731+#include <linux/types.h>
62732+#include <linux/grdefs.h>
62733+#include <linux/grinternal.h>
62734+#include <linux/capability.h>
62735+#include <linux/compat.h>
62736+#include <linux/module.h>
62737+
62738+#include <asm/uaccess.h>
62739+
62740+#ifdef CONFIG_GRKERNSEC_EXECLOG
62741+static char gr_exec_arg_buf[132];
62742+static DEFINE_MUTEX(gr_exec_arg_mutex);
62743+#endif
62744+
62745+void
62746+gr_handle_exec_args(struct linux_binprm *bprm, const char __user *const __user *argv)
62747+{
62748+#ifdef CONFIG_GRKERNSEC_EXECLOG
62749+ char *grarg = gr_exec_arg_buf;
62750+ unsigned int i, x, execlen = 0;
62751+ char c;
62752+
62753+ if (!((grsec_enable_execlog && grsec_enable_group &&
62754+ in_group_p(grsec_audit_gid))
62755+ || (grsec_enable_execlog && !grsec_enable_group)))
62756+ return;
62757+
62758+ mutex_lock(&gr_exec_arg_mutex);
62759+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
62760+
62761+ if (unlikely(argv == NULL))
62762+ goto log;
62763+
62764+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
62765+ const char __user *p;
62766+ unsigned int len;
62767+
62768+ if (copy_from_user(&p, argv + i, sizeof(p)))
62769+ goto log;
62770+ if (!p)
62771+ goto log;
62772+ len = strnlen_user(p, 128 - execlen);
62773+ if (len > 128 - execlen)
62774+ len = 128 - execlen;
62775+ else if (len > 0)
62776+ len--;
62777+ if (copy_from_user(grarg + execlen, p, len))
62778+ goto log;
62779+
62780+ /* rewrite unprintable characters */
62781+ for (x = 0; x < len; x++) {
62782+ c = *(grarg + execlen + x);
62783+ if (c < 32 || c > 126)
62784+ *(grarg + execlen + x) = ' ';
62785+ }
62786+
62787+ execlen += len;
62788+ *(grarg + execlen) = ' ';
62789+ *(grarg + execlen + 1) = '\0';
62790+ execlen++;
62791+ }
62792+
62793+ log:
62794+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
62795+ bprm->file->f_path.mnt, grarg);
62796+ mutex_unlock(&gr_exec_arg_mutex);
62797+#endif
62798+ return;
62799+}
62800+
62801+#ifdef CONFIG_COMPAT
62802+void
62803+gr_handle_exec_args_compat(struct linux_binprm *bprm, compat_uptr_t __user *argv)
62804+{
62805+#ifdef CONFIG_GRKERNSEC_EXECLOG
62806+ char *grarg = gr_exec_arg_buf;
62807+ unsigned int i, x, execlen = 0;
62808+ char c;
62809+
62810+ if (!((grsec_enable_execlog && grsec_enable_group &&
62811+ in_group_p(grsec_audit_gid))
62812+ || (grsec_enable_execlog && !grsec_enable_group)))
62813+ return;
62814+
62815+ mutex_lock(&gr_exec_arg_mutex);
62816+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
62817+
62818+ if (unlikely(argv == NULL))
62819+ goto log;
62820+
62821+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
62822+ compat_uptr_t p;
62823+ unsigned int len;
62824+
62825+ if (get_user(p, argv + i))
62826+ goto log;
62827+ len = strnlen_user(compat_ptr(p), 128 - execlen);
62828+ if (len > 128 - execlen)
62829+ len = 128 - execlen;
62830+ else if (len > 0)
62831+ len--;
62832+ else
62833+ goto log;
62834+ if (copy_from_user(grarg + execlen, compat_ptr(p), len))
62835+ goto log;
62836+
62837+ /* rewrite unprintable characters */
62838+ for (x = 0; x < len; x++) {
62839+ c = *(grarg + execlen + x);
62840+ if (c < 32 || c > 126)
62841+ *(grarg + execlen + x) = ' ';
62842+ }
62843+
62844+ execlen += len;
62845+ *(grarg + execlen) = ' ';
62846+ *(grarg + execlen + 1) = '\0';
62847+ execlen++;
62848+ }
62849+
62850+ log:
62851+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
62852+ bprm->file->f_path.mnt, grarg);
62853+ mutex_unlock(&gr_exec_arg_mutex);
62854+#endif
62855+ return;
62856+}
62857+#endif
62858+
62859+#ifdef CONFIG_GRKERNSEC
62860+extern int gr_acl_is_capable(const int cap);
62861+extern int gr_acl_is_capable_nolog(const int cap);
62862+extern int gr_chroot_is_capable(const int cap);
62863+extern int gr_chroot_is_capable_nolog(const int cap);
62864+#endif
62865+
62866+const char *captab_log[] = {
62867+ "CAP_CHOWN",
62868+ "CAP_DAC_OVERRIDE",
62869+ "CAP_DAC_READ_SEARCH",
62870+ "CAP_FOWNER",
62871+ "CAP_FSETID",
62872+ "CAP_KILL",
62873+ "CAP_SETGID",
62874+ "CAP_SETUID",
62875+ "CAP_SETPCAP",
62876+ "CAP_LINUX_IMMUTABLE",
62877+ "CAP_NET_BIND_SERVICE",
62878+ "CAP_NET_BROADCAST",
62879+ "CAP_NET_ADMIN",
62880+ "CAP_NET_RAW",
62881+ "CAP_IPC_LOCK",
62882+ "CAP_IPC_OWNER",
62883+ "CAP_SYS_MODULE",
62884+ "CAP_SYS_RAWIO",
62885+ "CAP_SYS_CHROOT",
62886+ "CAP_SYS_PTRACE",
62887+ "CAP_SYS_PACCT",
62888+ "CAP_SYS_ADMIN",
62889+ "CAP_SYS_BOOT",
62890+ "CAP_SYS_NICE",
62891+ "CAP_SYS_RESOURCE",
62892+ "CAP_SYS_TIME",
62893+ "CAP_SYS_TTY_CONFIG",
62894+ "CAP_MKNOD",
62895+ "CAP_LEASE",
62896+ "CAP_AUDIT_WRITE",
62897+ "CAP_AUDIT_CONTROL",
62898+ "CAP_SETFCAP",
62899+ "CAP_MAC_OVERRIDE",
62900+ "CAP_MAC_ADMIN"
62901+};
62902+
62903+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
62904+
62905+int gr_is_capable(const int cap)
62906+{
62907+#ifdef CONFIG_GRKERNSEC
62908+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
62909+ return 1;
62910+ return 0;
62911+#else
62912+ return 1;
62913+#endif
62914+}
62915+
62916+int gr_is_capable_nolog(const int cap)
62917+{
62918+#ifdef CONFIG_GRKERNSEC
62919+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
62920+ return 1;
62921+ return 0;
62922+#else
62923+ return 1;
62924+#endif
62925+}
62926+
62927+EXPORT_SYMBOL(gr_is_capable);
62928+EXPORT_SYMBOL(gr_is_capable_nolog);
62929diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
62930new file mode 100644
62931index 0000000..d3ee748
62932--- /dev/null
62933+++ b/grsecurity/grsec_fifo.c
62934@@ -0,0 +1,24 @@
62935+#include <linux/kernel.h>
62936+#include <linux/sched.h>
62937+#include <linux/fs.h>
62938+#include <linux/file.h>
62939+#include <linux/grinternal.h>
62940+
62941+int
62942+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
62943+ const struct dentry *dir, const int flag, const int acc_mode)
62944+{
62945+#ifdef CONFIG_GRKERNSEC_FIFO
62946+ const struct cred *cred = current_cred();
62947+
62948+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
62949+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
62950+ (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
62951+ (cred->fsuid != dentry->d_inode->i_uid)) {
62952+ if (!inode_permission(dentry->d_inode, acc_mode))
62953+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
62954+ return -EACCES;
62955+ }
62956+#endif
62957+ return 0;
62958+}
62959diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
62960new file mode 100644
62961index 0000000..8ca18bf
62962--- /dev/null
62963+++ b/grsecurity/grsec_fork.c
62964@@ -0,0 +1,23 @@
62965+#include <linux/kernel.h>
62966+#include <linux/sched.h>
62967+#include <linux/grsecurity.h>
62968+#include <linux/grinternal.h>
62969+#include <linux/errno.h>
62970+
62971+void
62972+gr_log_forkfail(const int retval)
62973+{
62974+#ifdef CONFIG_GRKERNSEC_FORKFAIL
62975+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
62976+ switch (retval) {
62977+ case -EAGAIN:
62978+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
62979+ break;
62980+ case -ENOMEM:
62981+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
62982+ break;
62983+ }
62984+ }
62985+#endif
62986+ return;
62987+}
62988diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
62989new file mode 100644
62990index 0000000..1e995d3
62991--- /dev/null
62992+++ b/grsecurity/grsec_init.c
62993@@ -0,0 +1,278 @@
62994+#include <linux/kernel.h>
62995+#include <linux/sched.h>
62996+#include <linux/mm.h>
62997+#include <linux/smp_lock.h>
62998+#include <linux/gracl.h>
62999+#include <linux/slab.h>
63000+#include <linux/vmalloc.h>
63001+#include <linux/percpu.h>
63002+#include <linux/module.h>
63003+
63004+int grsec_enable_ptrace_readexec;
63005+int grsec_enable_setxid;
63006+int grsec_enable_brute;
63007+int grsec_enable_link;
63008+int grsec_enable_dmesg;
63009+int grsec_enable_harden_ptrace;
63010+int grsec_enable_fifo;
63011+int grsec_enable_execlog;
63012+int grsec_enable_signal;
63013+int grsec_enable_forkfail;
63014+int grsec_enable_audit_ptrace;
63015+int grsec_enable_time;
63016+int grsec_enable_audit_textrel;
63017+int grsec_enable_group;
63018+int grsec_audit_gid;
63019+int grsec_enable_chdir;
63020+int grsec_enable_mount;
63021+int grsec_enable_rofs;
63022+int grsec_enable_chroot_findtask;
63023+int grsec_enable_chroot_mount;
63024+int grsec_enable_chroot_shmat;
63025+int grsec_enable_chroot_fchdir;
63026+int grsec_enable_chroot_double;
63027+int grsec_enable_chroot_pivot;
63028+int grsec_enable_chroot_chdir;
63029+int grsec_enable_chroot_chmod;
63030+int grsec_enable_chroot_mknod;
63031+int grsec_enable_chroot_nice;
63032+int grsec_enable_chroot_execlog;
63033+int grsec_enable_chroot_caps;
63034+int grsec_enable_chroot_sysctl;
63035+int grsec_enable_chroot_unix;
63036+int grsec_enable_tpe;
63037+int grsec_tpe_gid;
63038+int grsec_enable_blackhole;
63039+#ifdef CONFIG_IPV6_MODULE
63040+EXPORT_SYMBOL(grsec_enable_blackhole);
63041+#endif
63042+int grsec_lastack_retries;
63043+int grsec_enable_tpe_all;
63044+int grsec_enable_tpe_invert;
63045+int grsec_enable_socket_all;
63046+int grsec_socket_all_gid;
63047+int grsec_enable_socket_client;
63048+int grsec_socket_client_gid;
63049+int grsec_enable_socket_server;
63050+int grsec_socket_server_gid;
63051+int grsec_resource_logging;
63052+int grsec_disable_privio;
63053+int grsec_enable_log_rwxmaps;
63054+int grsec_lock;
63055+
63056+DEFINE_SPINLOCK(grsec_alert_lock);
63057+unsigned long grsec_alert_wtime = 0;
63058+unsigned long grsec_alert_fyet = 0;
63059+
63060+DEFINE_SPINLOCK(grsec_audit_lock);
63061+
63062+DEFINE_RWLOCK(grsec_exec_file_lock);
63063+
63064+char *gr_shared_page[4];
63065+
63066+char *gr_alert_log_fmt;
63067+char *gr_audit_log_fmt;
63068+char *gr_alert_log_buf;
63069+char *gr_audit_log_buf;
63070+
63071+extern struct gr_arg *gr_usermode;
63072+extern unsigned char *gr_system_salt;
63073+extern unsigned char *gr_system_sum;
63074+
63075+void __init
63076+grsecurity_init(void)
63077+{
63078+ int j;
63079+ /* create the per-cpu shared pages */
63080+
63081+#ifdef CONFIG_X86
63082+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
63083+#endif
63084+
63085+ for (j = 0; j < 4; j++) {
63086+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
63087+ if (gr_shared_page[j] == NULL) {
63088+ panic("Unable to allocate grsecurity shared page");
63089+ return;
63090+ }
63091+ }
63092+
63093+ /* allocate log buffers */
63094+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
63095+ if (!gr_alert_log_fmt) {
63096+ panic("Unable to allocate grsecurity alert log format buffer");
63097+ return;
63098+ }
63099+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
63100+ if (!gr_audit_log_fmt) {
63101+ panic("Unable to allocate grsecurity audit log format buffer");
63102+ return;
63103+ }
63104+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
63105+ if (!gr_alert_log_buf) {
63106+ panic("Unable to allocate grsecurity alert log buffer");
63107+ return;
63108+ }
63109+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
63110+ if (!gr_audit_log_buf) {
63111+ panic("Unable to allocate grsecurity audit log buffer");
63112+ return;
63113+ }
63114+
63115+ /* allocate memory for authentication structure */
63116+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
63117+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
63118+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
63119+
63120+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
63121+ panic("Unable to allocate grsecurity authentication structure");
63122+ return;
63123+ }
63124+
63125+
63126+#ifdef CONFIG_GRKERNSEC_IO
63127+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
63128+ grsec_disable_privio = 1;
63129+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
63130+ grsec_disable_privio = 1;
63131+#else
63132+ grsec_disable_privio = 0;
63133+#endif
63134+#endif
63135+
63136+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
63137+ /* for backward compatibility, tpe_invert always defaults to on if
63138+ enabled in the kernel
63139+ */
63140+ grsec_enable_tpe_invert = 1;
63141+#endif
63142+
63143+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
63144+#ifndef CONFIG_GRKERNSEC_SYSCTL
63145+ grsec_lock = 1;
63146+#endif
63147+
63148+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
63149+ grsec_enable_audit_textrel = 1;
63150+#endif
63151+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
63152+ grsec_enable_log_rwxmaps = 1;
63153+#endif
63154+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
63155+ grsec_enable_group = 1;
63156+ grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
63157+#endif
63158+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
63159+ grsec_enable_chdir = 1;
63160+#endif
63161+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
63162+ grsec_enable_harden_ptrace = 1;
63163+#endif
63164+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
63165+ grsec_enable_mount = 1;
63166+#endif
63167+#ifdef CONFIG_GRKERNSEC_LINK
63168+ grsec_enable_link = 1;
63169+#endif
63170+#ifdef CONFIG_GRKERNSEC_BRUTE
63171+ grsec_enable_brute = 1;
63172+#endif
63173+#ifdef CONFIG_GRKERNSEC_DMESG
63174+ grsec_enable_dmesg = 1;
63175+#endif
63176+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
63177+ grsec_enable_blackhole = 1;
63178+ grsec_lastack_retries = 4;
63179+#endif
63180+#ifdef CONFIG_GRKERNSEC_FIFO
63181+ grsec_enable_fifo = 1;
63182+#endif
63183+#ifdef CONFIG_GRKERNSEC_EXECLOG
63184+ grsec_enable_execlog = 1;
63185+#endif
63186+#ifdef CONFIG_GRKERNSEC_SETXID
63187+ grsec_enable_setxid = 1;
63188+#endif
63189+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
63190+ grsec_enable_ptrace_readexec = 1;
63191+#endif
63192+#ifdef CONFIG_GRKERNSEC_SIGNAL
63193+ grsec_enable_signal = 1;
63194+#endif
63195+#ifdef CONFIG_GRKERNSEC_FORKFAIL
63196+ grsec_enable_forkfail = 1;
63197+#endif
63198+#ifdef CONFIG_GRKERNSEC_TIME
63199+ grsec_enable_time = 1;
63200+#endif
63201+#ifdef CONFIG_GRKERNSEC_RESLOG
63202+ grsec_resource_logging = 1;
63203+#endif
63204+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
63205+ grsec_enable_chroot_findtask = 1;
63206+#endif
63207+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
63208+ grsec_enable_chroot_unix = 1;
63209+#endif
63210+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
63211+ grsec_enable_chroot_mount = 1;
63212+#endif
63213+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
63214+ grsec_enable_chroot_fchdir = 1;
63215+#endif
63216+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
63217+ grsec_enable_chroot_shmat = 1;
63218+#endif
63219+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
63220+ grsec_enable_audit_ptrace = 1;
63221+#endif
63222+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
63223+ grsec_enable_chroot_double = 1;
63224+#endif
63225+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
63226+ grsec_enable_chroot_pivot = 1;
63227+#endif
63228+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
63229+ grsec_enable_chroot_chdir = 1;
63230+#endif
63231+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
63232+ grsec_enable_chroot_chmod = 1;
63233+#endif
63234+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
63235+ grsec_enable_chroot_mknod = 1;
63236+#endif
63237+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
63238+ grsec_enable_chroot_nice = 1;
63239+#endif
63240+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
63241+ grsec_enable_chroot_execlog = 1;
63242+#endif
63243+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
63244+ grsec_enable_chroot_caps = 1;
63245+#endif
63246+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
63247+ grsec_enable_chroot_sysctl = 1;
63248+#endif
63249+#ifdef CONFIG_GRKERNSEC_TPE
63250+ grsec_enable_tpe = 1;
63251+ grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
63252+#ifdef CONFIG_GRKERNSEC_TPE_ALL
63253+ grsec_enable_tpe_all = 1;
63254+#endif
63255+#endif
63256+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
63257+ grsec_enable_socket_all = 1;
63258+ grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
63259+#endif
63260+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
63261+ grsec_enable_socket_client = 1;
63262+ grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
63263+#endif
63264+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
63265+ grsec_enable_socket_server = 1;
63266+ grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
63267+#endif
63268+#endif
63269+
63270+ return;
63271+}
63272diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
63273new file mode 100644
63274index 0000000..3efe141
63275--- /dev/null
63276+++ b/grsecurity/grsec_link.c
63277@@ -0,0 +1,43 @@
63278+#include <linux/kernel.h>
63279+#include <linux/sched.h>
63280+#include <linux/fs.h>
63281+#include <linux/file.h>
63282+#include <linux/grinternal.h>
63283+
63284+int
63285+gr_handle_follow_link(const struct inode *parent,
63286+ const struct inode *inode,
63287+ const struct dentry *dentry, const struct vfsmount *mnt)
63288+{
63289+#ifdef CONFIG_GRKERNSEC_LINK
63290+ const struct cred *cred = current_cred();
63291+
63292+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
63293+ (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
63294+ (parent->i_mode & S_IWOTH) && (cred->fsuid != inode->i_uid)) {
63295+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
63296+ return -EACCES;
63297+ }
63298+#endif
63299+ return 0;
63300+}
63301+
63302+int
63303+gr_handle_hardlink(const struct dentry *dentry,
63304+ const struct vfsmount *mnt,
63305+ struct inode *inode, const int mode, const char *to)
63306+{
63307+#ifdef CONFIG_GRKERNSEC_LINK
63308+ const struct cred *cred = current_cred();
63309+
63310+ if (grsec_enable_link && cred->fsuid != inode->i_uid &&
63311+ (!S_ISREG(mode) || (mode & S_ISUID) ||
63312+ ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
63313+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
63314+ !capable(CAP_FOWNER) && cred->uid) {
63315+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
63316+ return -EPERM;
63317+ }
63318+#endif
63319+ return 0;
63320+}
63321diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
63322new file mode 100644
63323index 0000000..a45d2e9
63324--- /dev/null
63325+++ b/grsecurity/grsec_log.c
63326@@ -0,0 +1,322 @@
63327+#include <linux/kernel.h>
63328+#include <linux/sched.h>
63329+#include <linux/file.h>
63330+#include <linux/tty.h>
63331+#include <linux/fs.h>
63332+#include <linux/grinternal.h>
63333+
63334+#ifdef CONFIG_TREE_PREEMPT_RCU
63335+#define DISABLE_PREEMPT() preempt_disable()
63336+#define ENABLE_PREEMPT() preempt_enable()
63337+#else
63338+#define DISABLE_PREEMPT()
63339+#define ENABLE_PREEMPT()
63340+#endif
63341+
63342+#define BEGIN_LOCKS(x) \
63343+ DISABLE_PREEMPT(); \
63344+ rcu_read_lock(); \
63345+ read_lock(&tasklist_lock); \
63346+ read_lock(&grsec_exec_file_lock); \
63347+ if (x != GR_DO_AUDIT) \
63348+ spin_lock(&grsec_alert_lock); \
63349+ else \
63350+ spin_lock(&grsec_audit_lock)
63351+
63352+#define END_LOCKS(x) \
63353+ if (x != GR_DO_AUDIT) \
63354+ spin_unlock(&grsec_alert_lock); \
63355+ else \
63356+ spin_unlock(&grsec_audit_lock); \
63357+ read_unlock(&grsec_exec_file_lock); \
63358+ read_unlock(&tasklist_lock); \
63359+ rcu_read_unlock(); \
63360+ ENABLE_PREEMPT(); \
63361+ if (x == GR_DONT_AUDIT) \
63362+ gr_handle_alertkill(current)
63363+
63364+enum {
63365+ FLOODING,
63366+ NO_FLOODING
63367+};
63368+
63369+extern char *gr_alert_log_fmt;
63370+extern char *gr_audit_log_fmt;
63371+extern char *gr_alert_log_buf;
63372+extern char *gr_audit_log_buf;
63373+
63374+static int gr_log_start(int audit)
63375+{
63376+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
63377+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
63378+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
63379+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
63380+ unsigned long curr_secs = get_seconds();
63381+
63382+ if (audit == GR_DO_AUDIT)
63383+ goto set_fmt;
63384+
63385+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
63386+ grsec_alert_wtime = curr_secs;
63387+ grsec_alert_fyet = 0;
63388+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
63389+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
63390+ grsec_alert_fyet++;
63391+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
63392+ grsec_alert_wtime = curr_secs;
63393+ grsec_alert_fyet++;
63394+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
63395+ return FLOODING;
63396+ }
63397+ else return FLOODING;
63398+
63399+set_fmt:
63400+#endif
63401+ memset(buf, 0, PAGE_SIZE);
63402+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
63403+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
63404+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
63405+ } else if (current->signal->curr_ip) {
63406+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
63407+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
63408+ } else if (gr_acl_is_enabled()) {
63409+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
63410+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
63411+ } else {
63412+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
63413+ strcpy(buf, fmt);
63414+ }
63415+
63416+ return NO_FLOODING;
63417+}
63418+
63419+static void gr_log_middle(int audit, const char *msg, va_list ap)
63420+ __attribute__ ((format (printf, 2, 0)));
63421+
63422+static void gr_log_middle(int audit, const char *msg, va_list ap)
63423+{
63424+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
63425+ unsigned int len = strlen(buf);
63426+
63427+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
63428+
63429+ return;
63430+}
63431+
63432+static void gr_log_middle_varargs(int audit, const char *msg, ...)
63433+ __attribute__ ((format (printf, 2, 3)));
63434+
63435+static void gr_log_middle_varargs(int audit, const char *msg, ...)
63436+{
63437+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
63438+ unsigned int len = strlen(buf);
63439+ va_list ap;
63440+
63441+ va_start(ap, msg);
63442+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
63443+ va_end(ap);
63444+
63445+ return;
63446+}
63447+
63448+static void gr_log_end(int audit, int append_default)
63449+{
63450+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
63451+
63452+ if (append_default) {
63453+ unsigned int len = strlen(buf);
63454+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
63455+ }
63456+
63457+ printk("%s\n", buf);
63458+
63459+ return;
63460+}
63461+
63462+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
63463+{
63464+ int logtype;
63465+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
63466+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
63467+ void *voidptr = NULL;
63468+ int num1 = 0, num2 = 0;
63469+ unsigned long ulong1 = 0, ulong2 = 0;
63470+ struct dentry *dentry = NULL;
63471+ struct vfsmount *mnt = NULL;
63472+ struct file *file = NULL;
63473+ struct task_struct *task = NULL;
63474+ const struct cred *cred, *pcred;
63475+ va_list ap;
63476+
63477+ BEGIN_LOCKS(audit);
63478+ logtype = gr_log_start(audit);
63479+ if (logtype == FLOODING) {
63480+ END_LOCKS(audit);
63481+ return;
63482+ }
63483+ va_start(ap, argtypes);
63484+ switch (argtypes) {
63485+ case GR_TTYSNIFF:
63486+ task = va_arg(ap, struct task_struct *);
63487+ 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);
63488+ break;
63489+ case GR_SYSCTL_HIDDEN:
63490+ str1 = va_arg(ap, char *);
63491+ gr_log_middle_varargs(audit, msg, result, str1);
63492+ break;
63493+ case GR_RBAC:
63494+ dentry = va_arg(ap, struct dentry *);
63495+ mnt = va_arg(ap, struct vfsmount *);
63496+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
63497+ break;
63498+ case GR_RBAC_STR:
63499+ dentry = va_arg(ap, struct dentry *);
63500+ mnt = va_arg(ap, struct vfsmount *);
63501+ str1 = va_arg(ap, char *);
63502+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
63503+ break;
63504+ case GR_STR_RBAC:
63505+ str1 = va_arg(ap, char *);
63506+ dentry = va_arg(ap, struct dentry *);
63507+ mnt = va_arg(ap, struct vfsmount *);
63508+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
63509+ break;
63510+ case GR_RBAC_MODE2:
63511+ dentry = va_arg(ap, struct dentry *);
63512+ mnt = va_arg(ap, struct vfsmount *);
63513+ str1 = va_arg(ap, char *);
63514+ str2 = va_arg(ap, char *);
63515+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
63516+ break;
63517+ case GR_RBAC_MODE3:
63518+ dentry = va_arg(ap, struct dentry *);
63519+ mnt = va_arg(ap, struct vfsmount *);
63520+ str1 = va_arg(ap, char *);
63521+ str2 = va_arg(ap, char *);
63522+ str3 = va_arg(ap, char *);
63523+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
63524+ break;
63525+ case GR_FILENAME:
63526+ dentry = va_arg(ap, struct dentry *);
63527+ mnt = va_arg(ap, struct vfsmount *);
63528+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
63529+ break;
63530+ case GR_STR_FILENAME:
63531+ str1 = va_arg(ap, char *);
63532+ dentry = va_arg(ap, struct dentry *);
63533+ mnt = va_arg(ap, struct vfsmount *);
63534+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
63535+ break;
63536+ case GR_FILENAME_STR:
63537+ dentry = va_arg(ap, struct dentry *);
63538+ mnt = va_arg(ap, struct vfsmount *);
63539+ str1 = va_arg(ap, char *);
63540+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
63541+ break;
63542+ case GR_FILENAME_TWO_INT:
63543+ dentry = va_arg(ap, struct dentry *);
63544+ mnt = va_arg(ap, struct vfsmount *);
63545+ num1 = va_arg(ap, int);
63546+ num2 = va_arg(ap, int);
63547+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
63548+ break;
63549+ case GR_FILENAME_TWO_INT_STR:
63550+ dentry = va_arg(ap, struct dentry *);
63551+ mnt = va_arg(ap, struct vfsmount *);
63552+ num1 = va_arg(ap, int);
63553+ num2 = va_arg(ap, int);
63554+ str1 = va_arg(ap, char *);
63555+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
63556+ break;
63557+ case GR_TEXTREL:
63558+ file = va_arg(ap, struct file *);
63559+ ulong1 = va_arg(ap, unsigned long);
63560+ ulong2 = va_arg(ap, unsigned long);
63561+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
63562+ break;
63563+ case GR_PTRACE:
63564+ task = va_arg(ap, struct task_struct *);
63565+ 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);
63566+ break;
63567+ case GR_RESOURCE:
63568+ task = va_arg(ap, struct task_struct *);
63569+ cred = __task_cred(task);
63570+ pcred = __task_cred(task->real_parent);
63571+ ulong1 = va_arg(ap, unsigned long);
63572+ str1 = va_arg(ap, char *);
63573+ ulong2 = va_arg(ap, unsigned long);
63574+ 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);
63575+ break;
63576+ case GR_CAP:
63577+ task = va_arg(ap, struct task_struct *);
63578+ cred = __task_cred(task);
63579+ pcred = __task_cred(task->real_parent);
63580+ str1 = va_arg(ap, char *);
63581+ 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);
63582+ break;
63583+ case GR_SIG:
63584+ str1 = va_arg(ap, char *);
63585+ voidptr = va_arg(ap, void *);
63586+ gr_log_middle_varargs(audit, msg, str1, voidptr);
63587+ break;
63588+ case GR_SIG2:
63589+ task = va_arg(ap, struct task_struct *);
63590+ cred = __task_cred(task);
63591+ pcred = __task_cred(task->real_parent);
63592+ num1 = va_arg(ap, int);
63593+ 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);
63594+ break;
63595+ case GR_CRASH1:
63596+ task = va_arg(ap, struct task_struct *);
63597+ cred = __task_cred(task);
63598+ pcred = __task_cred(task->real_parent);
63599+ ulong1 = va_arg(ap, unsigned long);
63600+ 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);
63601+ break;
63602+ case GR_CRASH2:
63603+ task = va_arg(ap, struct task_struct *);
63604+ cred = __task_cred(task);
63605+ pcred = __task_cred(task->real_parent);
63606+ ulong1 = va_arg(ap, unsigned long);
63607+ 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);
63608+ break;
63609+ case GR_RWXMAP:
63610+ file = va_arg(ap, struct file *);
63611+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
63612+ break;
63613+ case GR_PSACCT:
63614+ {
63615+ unsigned int wday, cday;
63616+ __u8 whr, chr;
63617+ __u8 wmin, cmin;
63618+ __u8 wsec, csec;
63619+ char cur_tty[64] = { 0 };
63620+ char parent_tty[64] = { 0 };
63621+
63622+ task = va_arg(ap, struct task_struct *);
63623+ wday = va_arg(ap, unsigned int);
63624+ cday = va_arg(ap, unsigned int);
63625+ whr = va_arg(ap, int);
63626+ chr = va_arg(ap, int);
63627+ wmin = va_arg(ap, int);
63628+ cmin = va_arg(ap, int);
63629+ wsec = va_arg(ap, int);
63630+ csec = va_arg(ap, int);
63631+ ulong1 = va_arg(ap, unsigned long);
63632+ cred = __task_cred(task);
63633+ pcred = __task_cred(task->real_parent);
63634+
63635+ 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);
63636+ }
63637+ break;
63638+ default:
63639+ gr_log_middle(audit, msg, ap);
63640+ }
63641+ va_end(ap);
63642+ // these don't need DEFAULTSECARGS printed on the end
63643+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
63644+ gr_log_end(audit, 0);
63645+ else
63646+ gr_log_end(audit, 1);
63647+ END_LOCKS(audit);
63648+}
63649diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
63650new file mode 100644
63651index 0000000..f536303
63652--- /dev/null
63653+++ b/grsecurity/grsec_mem.c
63654@@ -0,0 +1,40 @@
63655+#include <linux/kernel.h>
63656+#include <linux/sched.h>
63657+#include <linux/mm.h>
63658+#include <linux/mman.h>
63659+#include <linux/grinternal.h>
63660+
63661+void
63662+gr_handle_ioperm(void)
63663+{
63664+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
63665+ return;
63666+}
63667+
63668+void
63669+gr_handle_iopl(void)
63670+{
63671+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
63672+ return;
63673+}
63674+
63675+void
63676+gr_handle_mem_readwrite(u64 from, u64 to)
63677+{
63678+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
63679+ return;
63680+}
63681+
63682+void
63683+gr_handle_vm86(void)
63684+{
63685+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
63686+ return;
63687+}
63688+
63689+void
63690+gr_log_badprocpid(const char *entry)
63691+{
63692+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
63693+ return;
63694+}
63695diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
63696new file mode 100644
63697index 0000000..2131422
63698--- /dev/null
63699+++ b/grsecurity/grsec_mount.c
63700@@ -0,0 +1,62 @@
63701+#include <linux/kernel.h>
63702+#include <linux/sched.h>
63703+#include <linux/mount.h>
63704+#include <linux/grsecurity.h>
63705+#include <linux/grinternal.h>
63706+
63707+void
63708+gr_log_remount(const char *devname, const int retval)
63709+{
63710+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
63711+ if (grsec_enable_mount && (retval >= 0))
63712+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
63713+#endif
63714+ return;
63715+}
63716+
63717+void
63718+gr_log_unmount(const char *devname, const int retval)
63719+{
63720+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
63721+ if (grsec_enable_mount && (retval >= 0))
63722+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
63723+#endif
63724+ return;
63725+}
63726+
63727+void
63728+gr_log_mount(const char *from, const char *to, const int retval)
63729+{
63730+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
63731+ if (grsec_enable_mount && (retval >= 0))
63732+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
63733+#endif
63734+ return;
63735+}
63736+
63737+int
63738+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
63739+{
63740+#ifdef CONFIG_GRKERNSEC_ROFS
63741+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
63742+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
63743+ return -EPERM;
63744+ } else
63745+ return 0;
63746+#endif
63747+ return 0;
63748+}
63749+
63750+int
63751+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
63752+{
63753+#ifdef CONFIG_GRKERNSEC_ROFS
63754+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
63755+ dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
63756+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
63757+ return -EPERM;
63758+ } else
63759+ return 0;
63760+#endif
63761+ return 0;
63762+}
63763diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
63764new file mode 100644
63765index 0000000..a3b12a0
63766--- /dev/null
63767+++ b/grsecurity/grsec_pax.c
63768@@ -0,0 +1,36 @@
63769+#include <linux/kernel.h>
63770+#include <linux/sched.h>
63771+#include <linux/mm.h>
63772+#include <linux/file.h>
63773+#include <linux/grinternal.h>
63774+#include <linux/grsecurity.h>
63775+
63776+void
63777+gr_log_textrel(struct vm_area_struct * vma)
63778+{
63779+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
63780+ if (grsec_enable_audit_textrel)
63781+ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
63782+#endif
63783+ return;
63784+}
63785+
63786+void
63787+gr_log_rwxmmap(struct file *file)
63788+{
63789+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
63790+ if (grsec_enable_log_rwxmaps)
63791+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
63792+#endif
63793+ return;
63794+}
63795+
63796+void
63797+gr_log_rwxmprotect(struct file *file)
63798+{
63799+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
63800+ if (grsec_enable_log_rwxmaps)
63801+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
63802+#endif
63803+ return;
63804+}
63805diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
63806new file mode 100644
63807index 0000000..78f8733
63808--- /dev/null
63809+++ b/grsecurity/grsec_ptrace.c
63810@@ -0,0 +1,30 @@
63811+#include <linux/kernel.h>
63812+#include <linux/sched.h>
63813+#include <linux/grinternal.h>
63814+#include <linux/security.h>
63815+
63816+void
63817+gr_audit_ptrace(struct task_struct *task)
63818+{
63819+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
63820+ if (grsec_enable_audit_ptrace)
63821+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
63822+#endif
63823+ return;
63824+}
63825+
63826+int
63827+gr_ptrace_readexec(struct file *file, int unsafe_flags)
63828+{
63829+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
63830+ const struct dentry *dentry = file->f_path.dentry;
63831+ const struct vfsmount *mnt = file->f_path.mnt;
63832+
63833+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
63834+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
63835+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
63836+ return -EACCES;
63837+ }
63838+#endif
63839+ return 0;
63840+}
63841diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
63842new file mode 100644
63843index 0000000..c648492
63844--- /dev/null
63845+++ b/grsecurity/grsec_sig.c
63846@@ -0,0 +1,206 @@
63847+#include <linux/kernel.h>
63848+#include <linux/sched.h>
63849+#include <linux/delay.h>
63850+#include <linux/grsecurity.h>
63851+#include <linux/grinternal.h>
63852+#include <linux/hardirq.h>
63853+
63854+char *signames[] = {
63855+ [SIGSEGV] = "Segmentation fault",
63856+ [SIGILL] = "Illegal instruction",
63857+ [SIGABRT] = "Abort",
63858+ [SIGBUS] = "Invalid alignment/Bus error"
63859+};
63860+
63861+void
63862+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
63863+{
63864+#ifdef CONFIG_GRKERNSEC_SIGNAL
63865+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
63866+ (sig == SIGABRT) || (sig == SIGBUS))) {
63867+ if (t->pid == current->pid) {
63868+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
63869+ } else {
63870+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
63871+ }
63872+ }
63873+#endif
63874+ return;
63875+}
63876+
63877+int
63878+gr_handle_signal(const struct task_struct *p, const int sig)
63879+{
63880+#ifdef CONFIG_GRKERNSEC
63881+ /* ignore the 0 signal for protected task checks */
63882+ if (current->pid > 1 && sig && gr_check_protected_task(p)) {
63883+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
63884+ return -EPERM;
63885+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
63886+ return -EPERM;
63887+ }
63888+#endif
63889+ return 0;
63890+}
63891+
63892+#ifdef CONFIG_GRKERNSEC
63893+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
63894+
63895+int gr_fake_force_sig(int sig, struct task_struct *t)
63896+{
63897+ unsigned long int flags;
63898+ int ret, blocked, ignored;
63899+ struct k_sigaction *action;
63900+
63901+ spin_lock_irqsave(&t->sighand->siglock, flags);
63902+ action = &t->sighand->action[sig-1];
63903+ ignored = action->sa.sa_handler == SIG_IGN;
63904+ blocked = sigismember(&t->blocked, sig);
63905+ if (blocked || ignored) {
63906+ action->sa.sa_handler = SIG_DFL;
63907+ if (blocked) {
63908+ sigdelset(&t->blocked, sig);
63909+ recalc_sigpending_and_wake(t);
63910+ }
63911+ }
63912+ if (action->sa.sa_handler == SIG_DFL)
63913+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
63914+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
63915+
63916+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
63917+
63918+ return ret;
63919+}
63920+#endif
63921+
63922+#ifdef CONFIG_GRKERNSEC_BRUTE
63923+#define GR_USER_BAN_TIME (15 * 60)
63924+
63925+static int __get_dumpable(unsigned long mm_flags)
63926+{
63927+ int ret;
63928+
63929+ ret = mm_flags & MMF_DUMPABLE_MASK;
63930+ return (ret >= 2) ? 2 : ret;
63931+}
63932+#endif
63933+
63934+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
63935+{
63936+#ifdef CONFIG_GRKERNSEC_BRUTE
63937+ uid_t uid = 0;
63938+
63939+ if (!grsec_enable_brute)
63940+ return;
63941+
63942+ rcu_read_lock();
63943+ read_lock(&tasklist_lock);
63944+ read_lock(&grsec_exec_file_lock);
63945+ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
63946+ p->real_parent->brute = 1;
63947+ else {
63948+ const struct cred *cred = __task_cred(p), *cred2;
63949+ struct task_struct *tsk, *tsk2;
63950+
63951+ if (!__get_dumpable(mm_flags) && cred->uid) {
63952+ struct user_struct *user;
63953+
63954+ uid = cred->uid;
63955+
63956+ /* this is put upon execution past expiration */
63957+ user = find_user(uid);
63958+ if (user == NULL)
63959+ goto unlock;
63960+ user->banned = 1;
63961+ user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
63962+ if (user->ban_expires == ~0UL)
63963+ user->ban_expires--;
63964+
63965+ do_each_thread(tsk2, tsk) {
63966+ cred2 = __task_cred(tsk);
63967+ if (tsk != p && cred2->uid == uid)
63968+ gr_fake_force_sig(SIGKILL, tsk);
63969+ } while_each_thread(tsk2, tsk);
63970+ }
63971+ }
63972+unlock:
63973+ read_unlock(&grsec_exec_file_lock);
63974+ read_unlock(&tasklist_lock);
63975+ rcu_read_unlock();
63976+
63977+ if (uid)
63978+ printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n", uid, GR_USER_BAN_TIME / 60);
63979+#endif
63980+ return;
63981+}
63982+
63983+void gr_handle_brute_check(void)
63984+{
63985+#ifdef CONFIG_GRKERNSEC_BRUTE
63986+ if (current->brute)
63987+ msleep(30 * 1000);
63988+#endif
63989+ return;
63990+}
63991+
63992+void gr_handle_kernel_exploit(void)
63993+{
63994+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
63995+ const struct cred *cred;
63996+ struct task_struct *tsk, *tsk2;
63997+ struct user_struct *user;
63998+ uid_t uid;
63999+
64000+ if (in_irq() || in_serving_softirq() || in_nmi())
64001+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
64002+
64003+ uid = current_uid();
64004+
64005+ if (uid == 0)
64006+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
64007+ else {
64008+ /* kill all the processes of this user, hold a reference
64009+ to their creds struct, and prevent them from creating
64010+ another process until system reset
64011+ */
64012+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n", uid);
64013+ /* we intentionally leak this ref */
64014+ user = get_uid(current->cred->user);
64015+ if (user) {
64016+ user->banned = 1;
64017+ user->ban_expires = ~0UL;
64018+ }
64019+
64020+ read_lock(&tasklist_lock);
64021+ do_each_thread(tsk2, tsk) {
64022+ cred = __task_cred(tsk);
64023+ if (cred->uid == uid)
64024+ gr_fake_force_sig(SIGKILL, tsk);
64025+ } while_each_thread(tsk2, tsk);
64026+ read_unlock(&tasklist_lock);
64027+ }
64028+#endif
64029+}
64030+
64031+int __gr_process_user_ban(struct user_struct *user)
64032+{
64033+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
64034+ if (unlikely(user->banned)) {
64035+ if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
64036+ user->banned = 0;
64037+ user->ban_expires = 0;
64038+ free_uid(user);
64039+ } else
64040+ return -EPERM;
64041+ }
64042+#endif
64043+ return 0;
64044+}
64045+
64046+int gr_process_user_ban(void)
64047+{
64048+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
64049+ return __gr_process_user_ban(current->cred->user);
64050+#endif
64051+ return 0;
64052+}
64053diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
64054new file mode 100644
64055index 0000000..7512ea9
64056--- /dev/null
64057+++ b/grsecurity/grsec_sock.c
64058@@ -0,0 +1,275 @@
64059+#include <linux/kernel.h>
64060+#include <linux/module.h>
64061+#include <linux/sched.h>
64062+#include <linux/file.h>
64063+#include <linux/net.h>
64064+#include <linux/in.h>
64065+#include <linux/ip.h>
64066+#include <net/sock.h>
64067+#include <net/inet_sock.h>
64068+#include <linux/grsecurity.h>
64069+#include <linux/grinternal.h>
64070+#include <linux/gracl.h>
64071+
64072+kernel_cap_t gr_cap_rtnetlink(struct sock *sock);
64073+EXPORT_SYMBOL(gr_cap_rtnetlink);
64074+
64075+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
64076+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
64077+
64078+EXPORT_SYMBOL(gr_search_udp_recvmsg);
64079+EXPORT_SYMBOL(gr_search_udp_sendmsg);
64080+
64081+#ifdef CONFIG_UNIX_MODULE
64082+EXPORT_SYMBOL(gr_acl_handle_unix);
64083+EXPORT_SYMBOL(gr_acl_handle_mknod);
64084+EXPORT_SYMBOL(gr_handle_chroot_unix);
64085+EXPORT_SYMBOL(gr_handle_create);
64086+#endif
64087+
64088+#ifdef CONFIG_GRKERNSEC
64089+#define gr_conn_table_size 32749
64090+struct conn_table_entry {
64091+ struct conn_table_entry *next;
64092+ struct signal_struct *sig;
64093+};
64094+
64095+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
64096+DEFINE_SPINLOCK(gr_conn_table_lock);
64097+
64098+extern const char * gr_socktype_to_name(unsigned char type);
64099+extern const char * gr_proto_to_name(unsigned char proto);
64100+extern const char * gr_sockfamily_to_name(unsigned char family);
64101+
64102+static __inline__ int
64103+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
64104+{
64105+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
64106+}
64107+
64108+static __inline__ int
64109+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
64110+ __u16 sport, __u16 dport)
64111+{
64112+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
64113+ sig->gr_sport == sport && sig->gr_dport == dport))
64114+ return 1;
64115+ else
64116+ return 0;
64117+}
64118+
64119+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
64120+{
64121+ struct conn_table_entry **match;
64122+ unsigned int index;
64123+
64124+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
64125+ sig->gr_sport, sig->gr_dport,
64126+ gr_conn_table_size);
64127+
64128+ newent->sig = sig;
64129+
64130+ match = &gr_conn_table[index];
64131+ newent->next = *match;
64132+ *match = newent;
64133+
64134+ return;
64135+}
64136+
64137+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
64138+{
64139+ struct conn_table_entry *match, *last = NULL;
64140+ unsigned int index;
64141+
64142+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
64143+ sig->gr_sport, sig->gr_dport,
64144+ gr_conn_table_size);
64145+
64146+ match = gr_conn_table[index];
64147+ while (match && !conn_match(match->sig,
64148+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
64149+ sig->gr_dport)) {
64150+ last = match;
64151+ match = match->next;
64152+ }
64153+
64154+ if (match) {
64155+ if (last)
64156+ last->next = match->next;
64157+ else
64158+ gr_conn_table[index] = NULL;
64159+ kfree(match);
64160+ }
64161+
64162+ return;
64163+}
64164+
64165+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
64166+ __u16 sport, __u16 dport)
64167+{
64168+ struct conn_table_entry *match;
64169+ unsigned int index;
64170+
64171+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
64172+
64173+ match = gr_conn_table[index];
64174+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
64175+ match = match->next;
64176+
64177+ if (match)
64178+ return match->sig;
64179+ else
64180+ return NULL;
64181+}
64182+
64183+#endif
64184+
64185+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
64186+{
64187+#ifdef CONFIG_GRKERNSEC
64188+ struct signal_struct *sig = task->signal;
64189+ struct conn_table_entry *newent;
64190+
64191+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
64192+ if (newent == NULL)
64193+ return;
64194+ /* no bh lock needed since we are called with bh disabled */
64195+ spin_lock(&gr_conn_table_lock);
64196+ gr_del_task_from_ip_table_nolock(sig);
64197+ sig->gr_saddr = inet->rcv_saddr;
64198+ sig->gr_daddr = inet->daddr;
64199+ sig->gr_sport = inet->sport;
64200+ sig->gr_dport = inet->dport;
64201+ gr_add_to_task_ip_table_nolock(sig, newent);
64202+ spin_unlock(&gr_conn_table_lock);
64203+#endif
64204+ return;
64205+}
64206+
64207+void gr_del_task_from_ip_table(struct task_struct *task)
64208+{
64209+#ifdef CONFIG_GRKERNSEC
64210+ spin_lock_bh(&gr_conn_table_lock);
64211+ gr_del_task_from_ip_table_nolock(task->signal);
64212+ spin_unlock_bh(&gr_conn_table_lock);
64213+#endif
64214+ return;
64215+}
64216+
64217+void
64218+gr_attach_curr_ip(const struct sock *sk)
64219+{
64220+#ifdef CONFIG_GRKERNSEC
64221+ struct signal_struct *p, *set;
64222+ const struct inet_sock *inet = inet_sk(sk);
64223+
64224+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
64225+ return;
64226+
64227+ set = current->signal;
64228+
64229+ spin_lock_bh(&gr_conn_table_lock);
64230+ p = gr_lookup_task_ip_table(inet->daddr, inet->rcv_saddr,
64231+ inet->dport, inet->sport);
64232+ if (unlikely(p != NULL)) {
64233+ set->curr_ip = p->curr_ip;
64234+ set->used_accept = 1;
64235+ gr_del_task_from_ip_table_nolock(p);
64236+ spin_unlock_bh(&gr_conn_table_lock);
64237+ return;
64238+ }
64239+ spin_unlock_bh(&gr_conn_table_lock);
64240+
64241+ set->curr_ip = inet->daddr;
64242+ set->used_accept = 1;
64243+#endif
64244+ return;
64245+}
64246+
64247+int
64248+gr_handle_sock_all(const int family, const int type, const int protocol)
64249+{
64250+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
64251+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
64252+ (family != AF_UNIX)) {
64253+ if (family == AF_INET)
64254+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
64255+ else
64256+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
64257+ return -EACCES;
64258+ }
64259+#endif
64260+ return 0;
64261+}
64262+
64263+int
64264+gr_handle_sock_server(const struct sockaddr *sck)
64265+{
64266+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
64267+ if (grsec_enable_socket_server &&
64268+ in_group_p(grsec_socket_server_gid) &&
64269+ sck && (sck->sa_family != AF_UNIX) &&
64270+ (sck->sa_family != AF_LOCAL)) {
64271+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
64272+ return -EACCES;
64273+ }
64274+#endif
64275+ return 0;
64276+}
64277+
64278+int
64279+gr_handle_sock_server_other(const struct sock *sck)
64280+{
64281+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
64282+ if (grsec_enable_socket_server &&
64283+ in_group_p(grsec_socket_server_gid) &&
64284+ sck && (sck->sk_family != AF_UNIX) &&
64285+ (sck->sk_family != AF_LOCAL)) {
64286+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
64287+ return -EACCES;
64288+ }
64289+#endif
64290+ return 0;
64291+}
64292+
64293+int
64294+gr_handle_sock_client(const struct sockaddr *sck)
64295+{
64296+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
64297+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
64298+ sck && (sck->sa_family != AF_UNIX) &&
64299+ (sck->sa_family != AF_LOCAL)) {
64300+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
64301+ return -EACCES;
64302+ }
64303+#endif
64304+ return 0;
64305+}
64306+
64307+kernel_cap_t
64308+gr_cap_rtnetlink(struct sock *sock)
64309+{
64310+#ifdef CONFIG_GRKERNSEC
64311+ if (!gr_acl_is_enabled())
64312+ return current_cap();
64313+ else if (sock->sk_protocol == NETLINK_ISCSI &&
64314+ cap_raised(current_cap(), CAP_SYS_ADMIN) &&
64315+ gr_is_capable(CAP_SYS_ADMIN))
64316+ return current_cap();
64317+ else if (sock->sk_protocol == NETLINK_AUDIT &&
64318+ cap_raised(current_cap(), CAP_AUDIT_WRITE) &&
64319+ gr_is_capable(CAP_AUDIT_WRITE) &&
64320+ cap_raised(current_cap(), CAP_AUDIT_CONTROL) &&
64321+ gr_is_capable(CAP_AUDIT_CONTROL))
64322+ return current_cap();
64323+ else if (cap_raised(current_cap(), CAP_NET_ADMIN) &&
64324+ ((sock->sk_protocol == NETLINK_ROUTE) ?
64325+ gr_is_capable_nolog(CAP_NET_ADMIN) :
64326+ gr_is_capable(CAP_NET_ADMIN)))
64327+ return current_cap();
64328+ else
64329+ return __cap_empty_set;
64330+#else
64331+ return current_cap();
64332+#endif
64333+}
64334diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
64335new file mode 100644
64336index 0000000..31f3258
64337--- /dev/null
64338+++ b/grsecurity/grsec_sysctl.c
64339@@ -0,0 +1,499 @@
64340+#include <linux/kernel.h>
64341+#include <linux/sched.h>
64342+#include <linux/sysctl.h>
64343+#include <linux/grsecurity.h>
64344+#include <linux/grinternal.h>
64345+
64346+int
64347+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
64348+{
64349+#ifdef CONFIG_GRKERNSEC_SYSCTL
64350+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
64351+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
64352+ return -EACCES;
64353+ }
64354+#endif
64355+ return 0;
64356+}
64357+
64358+#ifdef CONFIG_GRKERNSEC_ROFS
64359+static int __maybe_unused one = 1;
64360+#endif
64361+
64362+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
64363+ctl_table grsecurity_table[] = {
64364+#ifdef CONFIG_GRKERNSEC_SYSCTL
64365+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
64366+#ifdef CONFIG_GRKERNSEC_IO
64367+ {
64368+ .ctl_name = CTL_UNNUMBERED,
64369+ .procname = "disable_priv_io",
64370+ .data = &grsec_disable_privio,
64371+ .maxlen = sizeof(int),
64372+ .mode = 0600,
64373+ .proc_handler = &proc_dointvec,
64374+ },
64375+#endif
64376+#endif
64377+#ifdef CONFIG_GRKERNSEC_LINK
64378+ {
64379+ .ctl_name = CTL_UNNUMBERED,
64380+ .procname = "linking_restrictions",
64381+ .data = &grsec_enable_link,
64382+ .maxlen = sizeof(int),
64383+ .mode = 0600,
64384+ .proc_handler = &proc_dointvec,
64385+ },
64386+#endif
64387+#ifdef CONFIG_GRKERNSEC_BRUTE
64388+ {
64389+ .ctl_name = CTL_UNNUMBERED,
64390+ .procname = "deter_bruteforce",
64391+ .data = &grsec_enable_brute,
64392+ .maxlen = sizeof(int),
64393+ .mode = 0600,
64394+ .proc_handler = &proc_dointvec,
64395+ },
64396+#endif
64397+#ifdef CONFIG_GRKERNSEC_FIFO
64398+ {
64399+ .ctl_name = CTL_UNNUMBERED,
64400+ .procname = "fifo_restrictions",
64401+ .data = &grsec_enable_fifo,
64402+ .maxlen = sizeof(int),
64403+ .mode = 0600,
64404+ .proc_handler = &proc_dointvec,
64405+ },
64406+#endif
64407+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
64408+ {
64409+ .ctl_name = CTL_UNNUMBERED,
64410+ .procname = "ptrace_readexec",
64411+ .data = &grsec_enable_ptrace_readexec,
64412+ .maxlen = sizeof(int),
64413+ .mode = 0600,
64414+ .proc_handler = &proc_dointvec,
64415+ },
64416+#endif
64417+#ifdef CONFIG_GRKERNSEC_SETXID
64418+ {
64419+ .ctl_name = CTL_UNNUMBERED,
64420+ .procname = "consistent_setxid",
64421+ .data = &grsec_enable_setxid,
64422+ .maxlen = sizeof(int),
64423+ .mode = 0600,
64424+ .proc_handler = &proc_dointvec,
64425+ },
64426+#endif
64427+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
64428+ {
64429+ .ctl_name = CTL_UNNUMBERED,
64430+ .procname = "ip_blackhole",
64431+ .data = &grsec_enable_blackhole,
64432+ .maxlen = sizeof(int),
64433+ .mode = 0600,
64434+ .proc_handler = &proc_dointvec,
64435+ },
64436+ {
64437+ .ctl_name = CTL_UNNUMBERED,
64438+ .procname = "lastack_retries",
64439+ .data = &grsec_lastack_retries,
64440+ .maxlen = sizeof(int),
64441+ .mode = 0600,
64442+ .proc_handler = &proc_dointvec,
64443+ },
64444+#endif
64445+#ifdef CONFIG_GRKERNSEC_EXECLOG
64446+ {
64447+ .ctl_name = CTL_UNNUMBERED,
64448+ .procname = "exec_logging",
64449+ .data = &grsec_enable_execlog,
64450+ .maxlen = sizeof(int),
64451+ .mode = 0600,
64452+ .proc_handler = &proc_dointvec,
64453+ },
64454+#endif
64455+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
64456+ {
64457+ .ctl_name = CTL_UNNUMBERED,
64458+ .procname = "rwxmap_logging",
64459+ .data = &grsec_enable_log_rwxmaps,
64460+ .maxlen = sizeof(int),
64461+ .mode = 0600,
64462+ .proc_handler = &proc_dointvec,
64463+ },
64464+#endif
64465+#ifdef CONFIG_GRKERNSEC_SIGNAL
64466+ {
64467+ .ctl_name = CTL_UNNUMBERED,
64468+ .procname = "signal_logging",
64469+ .data = &grsec_enable_signal,
64470+ .maxlen = sizeof(int),
64471+ .mode = 0600,
64472+ .proc_handler = &proc_dointvec,
64473+ },
64474+#endif
64475+#ifdef CONFIG_GRKERNSEC_FORKFAIL
64476+ {
64477+ .ctl_name = CTL_UNNUMBERED,
64478+ .procname = "forkfail_logging",
64479+ .data = &grsec_enable_forkfail,
64480+ .maxlen = sizeof(int),
64481+ .mode = 0600,
64482+ .proc_handler = &proc_dointvec,
64483+ },
64484+#endif
64485+#ifdef CONFIG_GRKERNSEC_TIME
64486+ {
64487+ .ctl_name = CTL_UNNUMBERED,
64488+ .procname = "timechange_logging",
64489+ .data = &grsec_enable_time,
64490+ .maxlen = sizeof(int),
64491+ .mode = 0600,
64492+ .proc_handler = &proc_dointvec,
64493+ },
64494+#endif
64495+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
64496+ {
64497+ .ctl_name = CTL_UNNUMBERED,
64498+ .procname = "chroot_deny_shmat",
64499+ .data = &grsec_enable_chroot_shmat,
64500+ .maxlen = sizeof(int),
64501+ .mode = 0600,
64502+ .proc_handler = &proc_dointvec,
64503+ },
64504+#endif
64505+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
64506+ {
64507+ .ctl_name = CTL_UNNUMBERED,
64508+ .procname = "chroot_deny_unix",
64509+ .data = &grsec_enable_chroot_unix,
64510+ .maxlen = sizeof(int),
64511+ .mode = 0600,
64512+ .proc_handler = &proc_dointvec,
64513+ },
64514+#endif
64515+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
64516+ {
64517+ .ctl_name = CTL_UNNUMBERED,
64518+ .procname = "chroot_deny_mount",
64519+ .data = &grsec_enable_chroot_mount,
64520+ .maxlen = sizeof(int),
64521+ .mode = 0600,
64522+ .proc_handler = &proc_dointvec,
64523+ },
64524+#endif
64525+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
64526+ {
64527+ .ctl_name = CTL_UNNUMBERED,
64528+ .procname = "chroot_deny_fchdir",
64529+ .data = &grsec_enable_chroot_fchdir,
64530+ .maxlen = sizeof(int),
64531+ .mode = 0600,
64532+ .proc_handler = &proc_dointvec,
64533+ },
64534+#endif
64535+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
64536+ {
64537+ .ctl_name = CTL_UNNUMBERED,
64538+ .procname = "chroot_deny_chroot",
64539+ .data = &grsec_enable_chroot_double,
64540+ .maxlen = sizeof(int),
64541+ .mode = 0600,
64542+ .proc_handler = &proc_dointvec,
64543+ },
64544+#endif
64545+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
64546+ {
64547+ .ctl_name = CTL_UNNUMBERED,
64548+ .procname = "chroot_deny_pivot",
64549+ .data = &grsec_enable_chroot_pivot,
64550+ .maxlen = sizeof(int),
64551+ .mode = 0600,
64552+ .proc_handler = &proc_dointvec,
64553+ },
64554+#endif
64555+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
64556+ {
64557+ .ctl_name = CTL_UNNUMBERED,
64558+ .procname = "chroot_enforce_chdir",
64559+ .data = &grsec_enable_chroot_chdir,
64560+ .maxlen = sizeof(int),
64561+ .mode = 0600,
64562+ .proc_handler = &proc_dointvec,
64563+ },
64564+#endif
64565+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
64566+ {
64567+ .ctl_name = CTL_UNNUMBERED,
64568+ .procname = "chroot_deny_chmod",
64569+ .data = &grsec_enable_chroot_chmod,
64570+ .maxlen = sizeof(int),
64571+ .mode = 0600,
64572+ .proc_handler = &proc_dointvec,
64573+ },
64574+#endif
64575+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
64576+ {
64577+ .ctl_name = CTL_UNNUMBERED,
64578+ .procname = "chroot_deny_mknod",
64579+ .data = &grsec_enable_chroot_mknod,
64580+ .maxlen = sizeof(int),
64581+ .mode = 0600,
64582+ .proc_handler = &proc_dointvec,
64583+ },
64584+#endif
64585+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
64586+ {
64587+ .ctl_name = CTL_UNNUMBERED,
64588+ .procname = "chroot_restrict_nice",
64589+ .data = &grsec_enable_chroot_nice,
64590+ .maxlen = sizeof(int),
64591+ .mode = 0600,
64592+ .proc_handler = &proc_dointvec,
64593+ },
64594+#endif
64595+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
64596+ {
64597+ .ctl_name = CTL_UNNUMBERED,
64598+ .procname = "chroot_execlog",
64599+ .data = &grsec_enable_chroot_execlog,
64600+ .maxlen = sizeof(int),
64601+ .mode = 0600,
64602+ .proc_handler = &proc_dointvec,
64603+ },
64604+#endif
64605+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
64606+ {
64607+ .ctl_name = CTL_UNNUMBERED,
64608+ .procname = "chroot_caps",
64609+ .data = &grsec_enable_chroot_caps,
64610+ .maxlen = sizeof(int),
64611+ .mode = 0600,
64612+ .proc_handler = &proc_dointvec,
64613+ },
64614+#endif
64615+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
64616+ {
64617+ .ctl_name = CTL_UNNUMBERED,
64618+ .procname = "chroot_deny_sysctl",
64619+ .data = &grsec_enable_chroot_sysctl,
64620+ .maxlen = sizeof(int),
64621+ .mode = 0600,
64622+ .proc_handler = &proc_dointvec,
64623+ },
64624+#endif
64625+#ifdef CONFIG_GRKERNSEC_TPE
64626+ {
64627+ .ctl_name = CTL_UNNUMBERED,
64628+ .procname = "tpe",
64629+ .data = &grsec_enable_tpe,
64630+ .maxlen = sizeof(int),
64631+ .mode = 0600,
64632+ .proc_handler = &proc_dointvec,
64633+ },
64634+ {
64635+ .ctl_name = CTL_UNNUMBERED,
64636+ .procname = "tpe_gid",
64637+ .data = &grsec_tpe_gid,
64638+ .maxlen = sizeof(int),
64639+ .mode = 0600,
64640+ .proc_handler = &proc_dointvec,
64641+ },
64642+#endif
64643+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
64644+ {
64645+ .ctl_name = CTL_UNNUMBERED,
64646+ .procname = "tpe_invert",
64647+ .data = &grsec_enable_tpe_invert,
64648+ .maxlen = sizeof(int),
64649+ .mode = 0600,
64650+ .proc_handler = &proc_dointvec,
64651+ },
64652+#endif
64653+#ifdef CONFIG_GRKERNSEC_TPE_ALL
64654+ {
64655+ .ctl_name = CTL_UNNUMBERED,
64656+ .procname = "tpe_restrict_all",
64657+ .data = &grsec_enable_tpe_all,
64658+ .maxlen = sizeof(int),
64659+ .mode = 0600,
64660+ .proc_handler = &proc_dointvec,
64661+ },
64662+#endif
64663+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
64664+ {
64665+ .ctl_name = CTL_UNNUMBERED,
64666+ .procname = "socket_all",
64667+ .data = &grsec_enable_socket_all,
64668+ .maxlen = sizeof(int),
64669+ .mode = 0600,
64670+ .proc_handler = &proc_dointvec,
64671+ },
64672+ {
64673+ .ctl_name = CTL_UNNUMBERED,
64674+ .procname = "socket_all_gid",
64675+ .data = &grsec_socket_all_gid,
64676+ .maxlen = sizeof(int),
64677+ .mode = 0600,
64678+ .proc_handler = &proc_dointvec,
64679+ },
64680+#endif
64681+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
64682+ {
64683+ .ctl_name = CTL_UNNUMBERED,
64684+ .procname = "socket_client",
64685+ .data = &grsec_enable_socket_client,
64686+ .maxlen = sizeof(int),
64687+ .mode = 0600,
64688+ .proc_handler = &proc_dointvec,
64689+ },
64690+ {
64691+ .ctl_name = CTL_UNNUMBERED,
64692+ .procname = "socket_client_gid",
64693+ .data = &grsec_socket_client_gid,
64694+ .maxlen = sizeof(int),
64695+ .mode = 0600,
64696+ .proc_handler = &proc_dointvec,
64697+ },
64698+#endif
64699+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
64700+ {
64701+ .ctl_name = CTL_UNNUMBERED,
64702+ .procname = "socket_server",
64703+ .data = &grsec_enable_socket_server,
64704+ .maxlen = sizeof(int),
64705+ .mode = 0600,
64706+ .proc_handler = &proc_dointvec,
64707+ },
64708+ {
64709+ .ctl_name = CTL_UNNUMBERED,
64710+ .procname = "socket_server_gid",
64711+ .data = &grsec_socket_server_gid,
64712+ .maxlen = sizeof(int),
64713+ .mode = 0600,
64714+ .proc_handler = &proc_dointvec,
64715+ },
64716+#endif
64717+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
64718+ {
64719+ .ctl_name = CTL_UNNUMBERED,
64720+ .procname = "audit_group",
64721+ .data = &grsec_enable_group,
64722+ .maxlen = sizeof(int),
64723+ .mode = 0600,
64724+ .proc_handler = &proc_dointvec,
64725+ },
64726+ {
64727+ .ctl_name = CTL_UNNUMBERED,
64728+ .procname = "audit_gid",
64729+ .data = &grsec_audit_gid,
64730+ .maxlen = sizeof(int),
64731+ .mode = 0600,
64732+ .proc_handler = &proc_dointvec,
64733+ },
64734+#endif
64735+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
64736+ {
64737+ .ctl_name = CTL_UNNUMBERED,
64738+ .procname = "audit_chdir",
64739+ .data = &grsec_enable_chdir,
64740+ .maxlen = sizeof(int),
64741+ .mode = 0600,
64742+ .proc_handler = &proc_dointvec,
64743+ },
64744+#endif
64745+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
64746+ {
64747+ .ctl_name = CTL_UNNUMBERED,
64748+ .procname = "audit_mount",
64749+ .data = &grsec_enable_mount,
64750+ .maxlen = sizeof(int),
64751+ .mode = 0600,
64752+ .proc_handler = &proc_dointvec,
64753+ },
64754+#endif
64755+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
64756+ {
64757+ .ctl_name = CTL_UNNUMBERED,
64758+ .procname = "audit_textrel",
64759+ .data = &grsec_enable_audit_textrel,
64760+ .maxlen = sizeof(int),
64761+ .mode = 0600,
64762+ .proc_handler = &proc_dointvec,
64763+ },
64764+#endif
64765+#ifdef CONFIG_GRKERNSEC_DMESG
64766+ {
64767+ .ctl_name = CTL_UNNUMBERED,
64768+ .procname = "dmesg",
64769+ .data = &grsec_enable_dmesg,
64770+ .maxlen = sizeof(int),
64771+ .mode = 0600,
64772+ .proc_handler = &proc_dointvec,
64773+ },
64774+#endif
64775+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
64776+ {
64777+ .ctl_name = CTL_UNNUMBERED,
64778+ .procname = "chroot_findtask",
64779+ .data = &grsec_enable_chroot_findtask,
64780+ .maxlen = sizeof(int),
64781+ .mode = 0600,
64782+ .proc_handler = &proc_dointvec,
64783+ },
64784+#endif
64785+#ifdef CONFIG_GRKERNSEC_RESLOG
64786+ {
64787+ .ctl_name = CTL_UNNUMBERED,
64788+ .procname = "resource_logging",
64789+ .data = &grsec_resource_logging,
64790+ .maxlen = sizeof(int),
64791+ .mode = 0600,
64792+ .proc_handler = &proc_dointvec,
64793+ },
64794+#endif
64795+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
64796+ {
64797+ .ctl_name = CTL_UNNUMBERED,
64798+ .procname = "audit_ptrace",
64799+ .data = &grsec_enable_audit_ptrace,
64800+ .maxlen = sizeof(int),
64801+ .mode = 0600,
64802+ .proc_handler = &proc_dointvec,
64803+ },
64804+#endif
64805+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
64806+ {
64807+ .ctl_name = CTL_UNNUMBERED,
64808+ .procname = "harden_ptrace",
64809+ .data = &grsec_enable_harden_ptrace,
64810+ .maxlen = sizeof(int),
64811+ .mode = 0600,
64812+ .proc_handler = &proc_dointvec,
64813+ },
64814+#endif
64815+ {
64816+ .ctl_name = CTL_UNNUMBERED,
64817+ .procname = "grsec_lock",
64818+ .data = &grsec_lock,
64819+ .maxlen = sizeof(int),
64820+ .mode = 0600,
64821+ .proc_handler = &proc_dointvec,
64822+ },
64823+#endif
64824+#ifdef CONFIG_GRKERNSEC_ROFS
64825+ {
64826+ .ctl_name = CTL_UNNUMBERED,
64827+ .procname = "romount_protect",
64828+ .data = &grsec_enable_rofs,
64829+ .maxlen = sizeof(int),
64830+ .mode = 0600,
64831+ .proc_handler = &proc_dointvec_minmax,
64832+ .extra1 = &one,
64833+ .extra2 = &one,
64834+ },
64835+#endif
64836+ { .ctl_name = 0 }
64837+};
64838+#endif
64839diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
64840new file mode 100644
64841index 0000000..0dc13c3
64842--- /dev/null
64843+++ b/grsecurity/grsec_time.c
64844@@ -0,0 +1,16 @@
64845+#include <linux/kernel.h>
64846+#include <linux/sched.h>
64847+#include <linux/grinternal.h>
64848+#include <linux/module.h>
64849+
64850+void
64851+gr_log_timechange(void)
64852+{
64853+#ifdef CONFIG_GRKERNSEC_TIME
64854+ if (grsec_enable_time)
64855+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
64856+#endif
64857+ return;
64858+}
64859+
64860+EXPORT_SYMBOL(gr_log_timechange);
64861diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
64862new file mode 100644
64863index 0000000..07e0dc0
64864--- /dev/null
64865+++ b/grsecurity/grsec_tpe.c
64866@@ -0,0 +1,73 @@
64867+#include <linux/kernel.h>
64868+#include <linux/sched.h>
64869+#include <linux/file.h>
64870+#include <linux/fs.h>
64871+#include <linux/grinternal.h>
64872+
64873+extern int gr_acl_tpe_check(void);
64874+
64875+int
64876+gr_tpe_allow(const struct file *file)
64877+{
64878+#ifdef CONFIG_GRKERNSEC
64879+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
64880+ const struct cred *cred = current_cred();
64881+ char *msg = NULL;
64882+ char *msg2 = NULL;
64883+
64884+ // never restrict root
64885+ if (!cred->uid)
64886+ return 1;
64887+
64888+ if (grsec_enable_tpe) {
64889+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
64890+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
64891+ msg = "not being in trusted group";
64892+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
64893+ msg = "being in untrusted group";
64894+#else
64895+ if (in_group_p(grsec_tpe_gid))
64896+ msg = "being in untrusted group";
64897+#endif
64898+ }
64899+ if (!msg && gr_acl_tpe_check())
64900+ msg = "being in untrusted role";
64901+
64902+ // not in any affected group/role
64903+ if (!msg)
64904+ goto next_check;
64905+
64906+ if (inode->i_uid)
64907+ msg2 = "file in non-root-owned directory";
64908+ else if (inode->i_mode & S_IWOTH)
64909+ msg2 = "file in world-writable directory";
64910+ else if (inode->i_mode & S_IWGRP)
64911+ msg2 = "file in group-writable directory";
64912+
64913+ if (msg && msg2) {
64914+ char fullmsg[70] = {0};
64915+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
64916+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
64917+ return 0;
64918+ }
64919+ msg = NULL;
64920+next_check:
64921+#ifdef CONFIG_GRKERNSEC_TPE_ALL
64922+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
64923+ return 1;
64924+
64925+ if (inode->i_uid && (inode->i_uid != cred->uid))
64926+ msg = "directory not owned by user";
64927+ else if (inode->i_mode & S_IWOTH)
64928+ msg = "file in world-writable directory";
64929+ else if (inode->i_mode & S_IWGRP)
64930+ msg = "file in group-writable directory";
64931+
64932+ if (msg) {
64933+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
64934+ return 0;
64935+ }
64936+#endif
64937+#endif
64938+ return 1;
64939+}
64940diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
64941new file mode 100644
64942index 0000000..9f7b1ac
64943--- /dev/null
64944+++ b/grsecurity/grsum.c
64945@@ -0,0 +1,61 @@
64946+#include <linux/err.h>
64947+#include <linux/kernel.h>
64948+#include <linux/sched.h>
64949+#include <linux/mm.h>
64950+#include <linux/scatterlist.h>
64951+#include <linux/crypto.h>
64952+#include <linux/gracl.h>
64953+
64954+
64955+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
64956+#error "crypto and sha256 must be built into the kernel"
64957+#endif
64958+
64959+int
64960+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
64961+{
64962+ char *p;
64963+ struct crypto_hash *tfm;
64964+ struct hash_desc desc;
64965+ struct scatterlist sg;
64966+ unsigned char temp_sum[GR_SHA_LEN];
64967+ volatile int retval = 0;
64968+ volatile int dummy = 0;
64969+ unsigned int i;
64970+
64971+ sg_init_table(&sg, 1);
64972+
64973+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
64974+ if (IS_ERR(tfm)) {
64975+ /* should never happen, since sha256 should be built in */
64976+ return 1;
64977+ }
64978+
64979+ desc.tfm = tfm;
64980+ desc.flags = 0;
64981+
64982+ crypto_hash_init(&desc);
64983+
64984+ p = salt;
64985+ sg_set_buf(&sg, p, GR_SALT_LEN);
64986+ crypto_hash_update(&desc, &sg, sg.length);
64987+
64988+ p = entry->pw;
64989+ sg_set_buf(&sg, p, strlen(p));
64990+
64991+ crypto_hash_update(&desc, &sg, sg.length);
64992+
64993+ crypto_hash_final(&desc, temp_sum);
64994+
64995+ memset(entry->pw, 0, GR_PW_LEN);
64996+
64997+ for (i = 0; i < GR_SHA_LEN; i++)
64998+ if (sum[i] != temp_sum[i])
64999+ retval = 1;
65000+ else
65001+ dummy = 1; // waste a cycle
65002+
65003+ crypto_free_hash(tfm);
65004+
65005+ return retval;
65006+}
65007diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
65008index 3cd9ccd..fe16d47 100644
65009--- a/include/acpi/acpi_bus.h
65010+++ b/include/acpi/acpi_bus.h
65011@@ -107,7 +107,7 @@ struct acpi_device_ops {
65012 acpi_op_bind bind;
65013 acpi_op_unbind unbind;
65014 acpi_op_notify notify;
65015-};
65016+} __no_const;
65017
65018 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
65019
65020diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
65021index f4906f6..71feb73 100644
65022--- a/include/acpi/acpi_drivers.h
65023+++ b/include/acpi/acpi_drivers.h
65024@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type);
65025 Dock Station
65026 -------------------------------------------------------------------------- */
65027 struct acpi_dock_ops {
65028- acpi_notify_handler handler;
65029- acpi_notify_handler uevent;
65030+ const acpi_notify_handler handler;
65031+ const acpi_notify_handler uevent;
65032 };
65033
65034 #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
65035@@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle handle);
65036 extern int register_dock_notifier(struct notifier_block *nb);
65037 extern void unregister_dock_notifier(struct notifier_block *nb);
65038 extern int register_hotplug_dock_device(acpi_handle handle,
65039- struct acpi_dock_ops *ops,
65040+ const struct acpi_dock_ops *ops,
65041 void *context);
65042 extern void unregister_hotplug_dock_device(acpi_handle handle);
65043 #else
65044@@ -144,7 +144,7 @@ static inline void unregister_dock_notifier(struct notifier_block *nb)
65045 {
65046 }
65047 static inline int register_hotplug_dock_device(acpi_handle handle,
65048- struct acpi_dock_ops *ops,
65049+ const struct acpi_dock_ops *ops,
65050 void *context)
65051 {
65052 return -ENODEV;
65053diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
65054index b7babf0..a9ac9fc 100644
65055--- a/include/asm-generic/atomic-long.h
65056+++ b/include/asm-generic/atomic-long.h
65057@@ -22,6 +22,12 @@
65058
65059 typedef atomic64_t atomic_long_t;
65060
65061+#ifdef CONFIG_PAX_REFCOUNT
65062+typedef atomic64_unchecked_t atomic_long_unchecked_t;
65063+#else
65064+typedef atomic64_t atomic_long_unchecked_t;
65065+#endif
65066+
65067 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
65068
65069 static inline long atomic_long_read(atomic_long_t *l)
65070@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
65071 return (long)atomic64_read(v);
65072 }
65073
65074+#ifdef CONFIG_PAX_REFCOUNT
65075+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
65076+{
65077+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
65078+
65079+ return (long)atomic64_read_unchecked(v);
65080+}
65081+#endif
65082+
65083 static inline void atomic_long_set(atomic_long_t *l, long i)
65084 {
65085 atomic64_t *v = (atomic64_t *)l;
65086@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
65087 atomic64_set(v, i);
65088 }
65089
65090+#ifdef CONFIG_PAX_REFCOUNT
65091+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
65092+{
65093+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
65094+
65095+ atomic64_set_unchecked(v, i);
65096+}
65097+#endif
65098+
65099 static inline void atomic_long_inc(atomic_long_t *l)
65100 {
65101 atomic64_t *v = (atomic64_t *)l;
65102@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
65103 atomic64_inc(v);
65104 }
65105
65106+#ifdef CONFIG_PAX_REFCOUNT
65107+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
65108+{
65109+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
65110+
65111+ atomic64_inc_unchecked(v);
65112+}
65113+#endif
65114+
65115 static inline void atomic_long_dec(atomic_long_t *l)
65116 {
65117 atomic64_t *v = (atomic64_t *)l;
65118@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
65119 atomic64_dec(v);
65120 }
65121
65122+#ifdef CONFIG_PAX_REFCOUNT
65123+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
65124+{
65125+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
65126+
65127+ atomic64_dec_unchecked(v);
65128+}
65129+#endif
65130+
65131 static inline void atomic_long_add(long i, atomic_long_t *l)
65132 {
65133 atomic64_t *v = (atomic64_t *)l;
65134@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
65135 atomic64_add(i, v);
65136 }
65137
65138+#ifdef CONFIG_PAX_REFCOUNT
65139+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
65140+{
65141+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
65142+
65143+ atomic64_add_unchecked(i, v);
65144+}
65145+#endif
65146+
65147 static inline void atomic_long_sub(long i, atomic_long_t *l)
65148 {
65149 atomic64_t *v = (atomic64_t *)l;
65150@@ -115,6 +166,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
65151 return (long)atomic64_inc_return(v);
65152 }
65153
65154+#ifdef CONFIG_PAX_REFCOUNT
65155+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
65156+{
65157+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
65158+
65159+ return (long)atomic64_inc_return_unchecked(v);
65160+}
65161+#endif
65162+
65163 static inline long atomic_long_dec_return(atomic_long_t *l)
65164 {
65165 atomic64_t *v = (atomic64_t *)l;
65166@@ -140,6 +200,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
65167
65168 typedef atomic_t atomic_long_t;
65169
65170+#ifdef CONFIG_PAX_REFCOUNT
65171+typedef atomic_unchecked_t atomic_long_unchecked_t;
65172+#else
65173+typedef atomic_t atomic_long_unchecked_t;
65174+#endif
65175+
65176 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
65177 static inline long atomic_long_read(atomic_long_t *l)
65178 {
65179@@ -148,6 +214,15 @@ static inline long atomic_long_read(atomic_long_t *l)
65180 return (long)atomic_read(v);
65181 }
65182
65183+#ifdef CONFIG_PAX_REFCOUNT
65184+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
65185+{
65186+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
65187+
65188+ return (long)atomic_read_unchecked(v);
65189+}
65190+#endif
65191+
65192 static inline void atomic_long_set(atomic_long_t *l, long i)
65193 {
65194 atomic_t *v = (atomic_t *)l;
65195@@ -155,6 +230,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
65196 atomic_set(v, i);
65197 }
65198
65199+#ifdef CONFIG_PAX_REFCOUNT
65200+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
65201+{
65202+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
65203+
65204+ atomic_set_unchecked(v, i);
65205+}
65206+#endif
65207+
65208 static inline void atomic_long_inc(atomic_long_t *l)
65209 {
65210 atomic_t *v = (atomic_t *)l;
65211@@ -162,6 +246,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
65212 atomic_inc(v);
65213 }
65214
65215+#ifdef CONFIG_PAX_REFCOUNT
65216+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
65217+{
65218+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
65219+
65220+ atomic_inc_unchecked(v);
65221+}
65222+#endif
65223+
65224 static inline void atomic_long_dec(atomic_long_t *l)
65225 {
65226 atomic_t *v = (atomic_t *)l;
65227@@ -169,6 +262,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
65228 atomic_dec(v);
65229 }
65230
65231+#ifdef CONFIG_PAX_REFCOUNT
65232+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
65233+{
65234+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
65235+
65236+ atomic_dec_unchecked(v);
65237+}
65238+#endif
65239+
65240 static inline void atomic_long_add(long i, atomic_long_t *l)
65241 {
65242 atomic_t *v = (atomic_t *)l;
65243@@ -176,6 +278,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
65244 atomic_add(i, v);
65245 }
65246
65247+#ifdef CONFIG_PAX_REFCOUNT
65248+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
65249+{
65250+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
65251+
65252+ atomic_add_unchecked(i, v);
65253+}
65254+#endif
65255+
65256 static inline void atomic_long_sub(long i, atomic_long_t *l)
65257 {
65258 atomic_t *v = (atomic_t *)l;
65259@@ -232,6 +343,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
65260 return (long)atomic_inc_return(v);
65261 }
65262
65263+#ifdef CONFIG_PAX_REFCOUNT
65264+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
65265+{
65266+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
65267+
65268+ return (long)atomic_inc_return_unchecked(v);
65269+}
65270+#endif
65271+
65272 static inline long atomic_long_dec_return(atomic_long_t *l)
65273 {
65274 atomic_t *v = (atomic_t *)l;
65275@@ -255,4 +375,47 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
65276
65277 #endif /* BITS_PER_LONG == 64 */
65278
65279+#ifdef CONFIG_PAX_REFCOUNT
65280+static inline void pax_refcount_needs_these_functions(void)
65281+{
65282+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
65283+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
65284+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
65285+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
65286+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
65287+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
65288+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
65289+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
65290+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
65291+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
65292+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
65293+
65294+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
65295+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
65296+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
65297+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
65298+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
65299+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
65300+}
65301+#else
65302+#define atomic_read_unchecked(v) atomic_read(v)
65303+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
65304+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
65305+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
65306+#define atomic_inc_unchecked(v) atomic_inc(v)
65307+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
65308+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
65309+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
65310+#define atomic_dec_unchecked(v) atomic_dec(v)
65311+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
65312+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
65313+
65314+#define atomic_long_read_unchecked(v) atomic_long_read(v)
65315+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
65316+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
65317+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
65318+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
65319+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
65320+#endif
65321+
65322 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
65323diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
65324index b18ce4f..2ee2843 100644
65325--- a/include/asm-generic/atomic64.h
65326+++ b/include/asm-generic/atomic64.h
65327@@ -16,6 +16,8 @@ typedef struct {
65328 long long counter;
65329 } atomic64_t;
65330
65331+typedef atomic64_t atomic64_unchecked_t;
65332+
65333 #define ATOMIC64_INIT(i) { (i) }
65334
65335 extern long long atomic64_read(const atomic64_t *v);
65336@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
65337 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
65338 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
65339
65340+#define atomic64_read_unchecked(v) atomic64_read(v)
65341+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
65342+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
65343+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
65344+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
65345+#define atomic64_inc_unchecked(v) atomic64_inc(v)
65346+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
65347+#define atomic64_dec_unchecked(v) atomic64_dec(v)
65348+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
65349+
65350 #endif /* _ASM_GENERIC_ATOMIC64_H */
65351diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
65352index d48ddf0..656a0ac 100644
65353--- a/include/asm-generic/bug.h
65354+++ b/include/asm-generic/bug.h
65355@@ -105,11 +105,11 @@ extern void warn_slowpath_null(const char *file, const int line);
65356
65357 #else /* !CONFIG_BUG */
65358 #ifndef HAVE_ARCH_BUG
65359-#define BUG() do {} while(0)
65360+#define BUG() do { for (;;) ; } while(0)
65361 #endif
65362
65363 #ifndef HAVE_ARCH_BUG_ON
65364-#define BUG_ON(condition) do { if (condition) ; } while(0)
65365+#define BUG_ON(condition) do { if (condition) for (;;) ; } while(0)
65366 #endif
65367
65368 #ifndef HAVE_ARCH_WARN_ON
65369diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
65370index 1bfcfe5..e04c5c9 100644
65371--- a/include/asm-generic/cache.h
65372+++ b/include/asm-generic/cache.h
65373@@ -6,7 +6,7 @@
65374 * cache lines need to provide their own cache.h.
65375 */
65376
65377-#define L1_CACHE_SHIFT 5
65378-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
65379+#define L1_CACHE_SHIFT 5UL
65380+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
65381
65382 #endif /* __ASM_GENERIC_CACHE_H */
65383diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h
65384index 6920695..41038bc 100644
65385--- a/include/asm-generic/dma-mapping-common.h
65386+++ b/include/asm-generic/dma-mapping-common.h
65387@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
65388 enum dma_data_direction dir,
65389 struct dma_attrs *attrs)
65390 {
65391- struct dma_map_ops *ops = get_dma_ops(dev);
65392+ const struct dma_map_ops *ops = get_dma_ops(dev);
65393 dma_addr_t addr;
65394
65395 kmemcheck_mark_initialized(ptr, size);
65396@@ -30,7 +30,7 @@ static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
65397 enum dma_data_direction dir,
65398 struct dma_attrs *attrs)
65399 {
65400- struct dma_map_ops *ops = get_dma_ops(dev);
65401+ const struct dma_map_ops *ops = get_dma_ops(dev);
65402
65403 BUG_ON(!valid_dma_direction(dir));
65404 if (ops->unmap_page)
65405@@ -42,7 +42,7 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
65406 int nents, enum dma_data_direction dir,
65407 struct dma_attrs *attrs)
65408 {
65409- struct dma_map_ops *ops = get_dma_ops(dev);
65410+ const struct dma_map_ops *ops = get_dma_ops(dev);
65411 int i, ents;
65412 struct scatterlist *s;
65413
65414@@ -59,7 +59,7 @@ static inline void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg
65415 int nents, enum dma_data_direction dir,
65416 struct dma_attrs *attrs)
65417 {
65418- struct dma_map_ops *ops = get_dma_ops(dev);
65419+ const struct dma_map_ops *ops = get_dma_ops(dev);
65420
65421 BUG_ON(!valid_dma_direction(dir));
65422 debug_dma_unmap_sg(dev, sg, nents, dir);
65423@@ -71,7 +71,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
65424 size_t offset, size_t size,
65425 enum dma_data_direction dir)
65426 {
65427- struct dma_map_ops *ops = get_dma_ops(dev);
65428+ const struct dma_map_ops *ops = get_dma_ops(dev);
65429 dma_addr_t addr;
65430
65431 kmemcheck_mark_initialized(page_address(page) + offset, size);
65432@@ -85,7 +85,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
65433 static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
65434 size_t size, enum dma_data_direction dir)
65435 {
65436- struct dma_map_ops *ops = get_dma_ops(dev);
65437+ const struct dma_map_ops *ops = get_dma_ops(dev);
65438
65439 BUG_ON(!valid_dma_direction(dir));
65440 if (ops->unmap_page)
65441@@ -97,7 +97,7 @@ static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,
65442 size_t size,
65443 enum dma_data_direction dir)
65444 {
65445- struct dma_map_ops *ops = get_dma_ops(dev);
65446+ const struct dma_map_ops *ops = get_dma_ops(dev);
65447
65448 BUG_ON(!valid_dma_direction(dir));
65449 if (ops->sync_single_for_cpu)
65450@@ -109,7 +109,7 @@ static inline void dma_sync_single_for_device(struct device *dev,
65451 dma_addr_t addr, size_t size,
65452 enum dma_data_direction dir)
65453 {
65454- struct dma_map_ops *ops = get_dma_ops(dev);
65455+ const struct dma_map_ops *ops = get_dma_ops(dev);
65456
65457 BUG_ON(!valid_dma_direction(dir));
65458 if (ops->sync_single_for_device)
65459@@ -123,7 +123,7 @@ static inline void dma_sync_single_range_for_cpu(struct device *dev,
65460 size_t size,
65461 enum dma_data_direction dir)
65462 {
65463- struct dma_map_ops *ops = get_dma_ops(dev);
65464+ const struct dma_map_ops *ops = get_dma_ops(dev);
65465
65466 BUG_ON(!valid_dma_direction(dir));
65467 if (ops->sync_single_range_for_cpu) {
65468@@ -140,7 +140,7 @@ static inline void dma_sync_single_range_for_device(struct device *dev,
65469 size_t size,
65470 enum dma_data_direction dir)
65471 {
65472- struct dma_map_ops *ops = get_dma_ops(dev);
65473+ const struct dma_map_ops *ops = get_dma_ops(dev);
65474
65475 BUG_ON(!valid_dma_direction(dir));
65476 if (ops->sync_single_range_for_device) {
65477@@ -155,7 +155,7 @@ static inline void
65478 dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
65479 int nelems, enum dma_data_direction dir)
65480 {
65481- struct dma_map_ops *ops = get_dma_ops(dev);
65482+ const struct dma_map_ops *ops = get_dma_ops(dev);
65483
65484 BUG_ON(!valid_dma_direction(dir));
65485 if (ops->sync_sg_for_cpu)
65486@@ -167,7 +167,7 @@ static inline void
65487 dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
65488 int nelems, enum dma_data_direction dir)
65489 {
65490- struct dma_map_ops *ops = get_dma_ops(dev);
65491+ const struct dma_map_ops *ops = get_dma_ops(dev);
65492
65493 BUG_ON(!valid_dma_direction(dir));
65494 if (ops->sync_sg_for_device)
65495diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
65496index 0d68a1e..b74a761 100644
65497--- a/include/asm-generic/emergency-restart.h
65498+++ b/include/asm-generic/emergency-restart.h
65499@@ -1,7 +1,7 @@
65500 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
65501 #define _ASM_GENERIC_EMERGENCY_RESTART_H
65502
65503-static inline void machine_emergency_restart(void)
65504+static inline __noreturn void machine_emergency_restart(void)
65505 {
65506 machine_restart(NULL);
65507 }
65508diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
65509index 3c2344f..4590a7d 100644
65510--- a/include/asm-generic/futex.h
65511+++ b/include/asm-generic/futex.h
65512@@ -6,7 +6,7 @@
65513 #include <asm/errno.h>
65514
65515 static inline int
65516-futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
65517+futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
65518 {
65519 int op = (encoded_op >> 28) & 7;
65520 int cmp = (encoded_op >> 24) & 15;
65521@@ -48,7 +48,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
65522 }
65523
65524 static inline int
65525-futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
65526+futex_atomic_cmpxchg_inatomic(u32 __user *uaddr, int oldval, int newval)
65527 {
65528 return -ENOSYS;
65529 }
65530diff --git a/include/asm-generic/int-l64.h b/include/asm-generic/int-l64.h
65531index 1ca3efc..e3dc852 100644
65532--- a/include/asm-generic/int-l64.h
65533+++ b/include/asm-generic/int-l64.h
65534@@ -46,6 +46,8 @@ typedef unsigned int u32;
65535 typedef signed long s64;
65536 typedef unsigned long u64;
65537
65538+typedef unsigned int intoverflow_t __attribute__ ((mode(TI)));
65539+
65540 #define S8_C(x) x
65541 #define U8_C(x) x ## U
65542 #define S16_C(x) x
65543diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
65544index f394147..b6152b9 100644
65545--- a/include/asm-generic/int-ll64.h
65546+++ b/include/asm-generic/int-ll64.h
65547@@ -51,6 +51,8 @@ typedef unsigned int u32;
65548 typedef signed long long s64;
65549 typedef unsigned long long u64;
65550
65551+typedef unsigned long long intoverflow_t;
65552+
65553 #define S8_C(x) x
65554 #define U8_C(x) x ## U
65555 #define S16_C(x) x
65556diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
65557index e5f234a..cdb16b3 100644
65558--- a/include/asm-generic/kmap_types.h
65559+++ b/include/asm-generic/kmap_types.h
65560@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
65561 KMAP_D(16) KM_IRQ_PTE,
65562 KMAP_D(17) KM_NMI,
65563 KMAP_D(18) KM_NMI_PTE,
65564-KMAP_D(19) KM_TYPE_NR
65565+KMAP_D(19) KM_CLEARPAGE,
65566+KMAP_D(20) KM_TYPE_NR
65567 };
65568
65569 #undef KMAP_D
65570diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
65571index 725612b..9cc513a 100644
65572--- a/include/asm-generic/pgtable-nopmd.h
65573+++ b/include/asm-generic/pgtable-nopmd.h
65574@@ -1,14 +1,19 @@
65575 #ifndef _PGTABLE_NOPMD_H
65576 #define _PGTABLE_NOPMD_H
65577
65578-#ifndef __ASSEMBLY__
65579-
65580 #include <asm-generic/pgtable-nopud.h>
65581
65582-struct mm_struct;
65583-
65584 #define __PAGETABLE_PMD_FOLDED
65585
65586+#define PMD_SHIFT PUD_SHIFT
65587+#define PTRS_PER_PMD 1
65588+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
65589+#define PMD_MASK (~(PMD_SIZE-1))
65590+
65591+#ifndef __ASSEMBLY__
65592+
65593+struct mm_struct;
65594+
65595 /*
65596 * Having the pmd type consist of a pud gets the size right, and allows
65597 * us to conceptually access the pud entry that this pmd is folded into
65598@@ -16,11 +21,6 @@ struct mm_struct;
65599 */
65600 typedef struct { pud_t pud; } pmd_t;
65601
65602-#define PMD_SHIFT PUD_SHIFT
65603-#define PTRS_PER_PMD 1
65604-#define PMD_SIZE (1UL << PMD_SHIFT)
65605-#define PMD_MASK (~(PMD_SIZE-1))
65606-
65607 /*
65608 * The "pud_xxx()" functions here are trivial for a folded two-level
65609 * setup: the pmd is never bad, and a pmd always exists (as it's folded
65610diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
65611index 810431d..ccc3638 100644
65612--- a/include/asm-generic/pgtable-nopud.h
65613+++ b/include/asm-generic/pgtable-nopud.h
65614@@ -1,10 +1,15 @@
65615 #ifndef _PGTABLE_NOPUD_H
65616 #define _PGTABLE_NOPUD_H
65617
65618-#ifndef __ASSEMBLY__
65619-
65620 #define __PAGETABLE_PUD_FOLDED
65621
65622+#define PUD_SHIFT PGDIR_SHIFT
65623+#define PTRS_PER_PUD 1
65624+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
65625+#define PUD_MASK (~(PUD_SIZE-1))
65626+
65627+#ifndef __ASSEMBLY__
65628+
65629 /*
65630 * Having the pud type consist of a pgd gets the size right, and allows
65631 * us to conceptually access the pgd entry that this pud is folded into
65632@@ -12,11 +17,6 @@
65633 */
65634 typedef struct { pgd_t pgd; } pud_t;
65635
65636-#define PUD_SHIFT PGDIR_SHIFT
65637-#define PTRS_PER_PUD 1
65638-#define PUD_SIZE (1UL << PUD_SHIFT)
65639-#define PUD_MASK (~(PUD_SIZE-1))
65640-
65641 /*
65642 * The "pgd_xxx()" functions here are trivial for a folded two-level
65643 * setup: the pud is never bad, and a pud always exists (as it's folded
65644diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
65645index e2bd73e..fea8ed3 100644
65646--- a/include/asm-generic/pgtable.h
65647+++ b/include/asm-generic/pgtable.h
65648@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_area_struct *vma, unsigned long pfn,
65649 unsigned long size);
65650 #endif
65651
65652+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
65653+static inline unsigned long pax_open_kernel(void) { return 0; }
65654+#endif
65655+
65656+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
65657+static inline unsigned long pax_close_kernel(void) { return 0; }
65658+#endif
65659+
65660 #endif /* !__ASSEMBLY__ */
65661
65662 #endif /* _ASM_GENERIC_PGTABLE_H */
65663diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
65664index b6e818f..21aa58a 100644
65665--- a/include/asm-generic/vmlinux.lds.h
65666+++ b/include/asm-generic/vmlinux.lds.h
65667@@ -199,6 +199,7 @@
65668 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
65669 VMLINUX_SYMBOL(__start_rodata) = .; \
65670 *(.rodata) *(.rodata.*) \
65671+ *(.data.read_only) \
65672 *(__vermagic) /* Kernel version magic */ \
65673 *(__markers_strings) /* Markers: strings */ \
65674 *(__tracepoints_strings)/* Tracepoints: strings */ \
65675@@ -656,22 +657,24 @@
65676 * section in the linker script will go there too. @phdr should have
65677 * a leading colon.
65678 *
65679- * Note that this macros defines __per_cpu_load as an absolute symbol.
65680+ * Note that this macros defines per_cpu_load as an absolute symbol.
65681 * If there is no need to put the percpu section at a predetermined
65682 * address, use PERCPU().
65683 */
65684 #define PERCPU_VADDR(vaddr, phdr) \
65685- VMLINUX_SYMBOL(__per_cpu_load) = .; \
65686- .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
65687+ per_cpu_load = .; \
65688+ .data.percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
65689 - LOAD_OFFSET) { \
65690+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
65691 VMLINUX_SYMBOL(__per_cpu_start) = .; \
65692 *(.data.percpu.first) \
65693- *(.data.percpu.page_aligned) \
65694 *(.data.percpu) \
65695+ . = ALIGN(PAGE_SIZE); \
65696+ *(.data.percpu.page_aligned) \
65697 *(.data.percpu.shared_aligned) \
65698 VMLINUX_SYMBOL(__per_cpu_end) = .; \
65699 } phdr \
65700- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data.percpu);
65701+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data.percpu);
65702
65703 /**
65704 * PERCPU - define output section for percpu area, simple version
65705diff --git a/include/drm/drmP.h b/include/drm/drmP.h
65706index ebab6a6..351dba1 100644
65707--- a/include/drm/drmP.h
65708+++ b/include/drm/drmP.h
65709@@ -71,6 +71,7 @@
65710 #include <linux/workqueue.h>
65711 #include <linux/poll.h>
65712 #include <asm/pgalloc.h>
65713+#include <asm/local.h>
65714 #include "drm.h"
65715
65716 #include <linux/idr.h>
65717@@ -814,7 +815,7 @@ struct drm_driver {
65718 void (*vgaarb_irq)(struct drm_device *dev, bool state);
65719
65720 /* Driver private ops for this object */
65721- struct vm_operations_struct *gem_vm_ops;
65722+ const struct vm_operations_struct *gem_vm_ops;
65723
65724 int major;
65725 int minor;
65726@@ -917,7 +918,7 @@ struct drm_device {
65727
65728 /** \name Usage Counters */
65729 /*@{ */
65730- int open_count; /**< Outstanding files open */
65731+ local_t open_count; /**< Outstanding files open */
65732 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
65733 atomic_t vma_count; /**< Outstanding vma areas open */
65734 int buf_use; /**< Buffers in use -- cannot alloc */
65735@@ -928,7 +929,7 @@ struct drm_device {
65736 /*@{ */
65737 unsigned long counters;
65738 enum drm_stat_type types[15];
65739- atomic_t counts[15];
65740+ atomic_unchecked_t counts[15];
65741 /*@} */
65742
65743 struct list_head filelist;
65744@@ -1016,7 +1017,7 @@ struct drm_device {
65745 struct pci_controller *hose;
65746 #endif
65747 struct drm_sg_mem *sg; /**< Scatter gather memory */
65748- unsigned int num_crtcs; /**< Number of CRTCs on this device */
65749+ unsigned int num_crtcs; /**< Number of CRTCs on this device */
65750 void *dev_private; /**< device private data */
65751 void *mm_private;
65752 struct address_space *dev_mapping;
65753@@ -1042,11 +1043,11 @@ struct drm_device {
65754 spinlock_t object_name_lock;
65755 struct idr object_name_idr;
65756 atomic_t object_count;
65757- atomic_t object_memory;
65758+ atomic_unchecked_t object_memory;
65759 atomic_t pin_count;
65760- atomic_t pin_memory;
65761+ atomic_unchecked_t pin_memory;
65762 atomic_t gtt_count;
65763- atomic_t gtt_memory;
65764+ atomic_unchecked_t gtt_memory;
65765 uint32_t gtt_total;
65766 uint32_t invalidate_domains; /* domains pending invalidation */
65767 uint32_t flush_domains; /* domains pending flush */
65768diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
65769index b29e201..3413cc9 100644
65770--- a/include/drm/drm_crtc_helper.h
65771+++ b/include/drm/drm_crtc_helper.h
65772@@ -64,7 +64,7 @@ struct drm_crtc_helper_funcs {
65773
65774 /* reload the current crtc LUT */
65775 void (*load_lut)(struct drm_crtc *crtc);
65776-};
65777+} __no_const;
65778
65779 struct drm_encoder_helper_funcs {
65780 void (*dpms)(struct drm_encoder *encoder, int mode);
65781@@ -85,7 +85,7 @@ struct drm_encoder_helper_funcs {
65782 struct drm_connector *connector);
65783 /* disable encoder when not in use - more explicit than dpms off */
65784 void (*disable)(struct drm_encoder *encoder);
65785-};
65786+} __no_const;
65787
65788 struct drm_connector_helper_funcs {
65789 int (*get_modes)(struct drm_connector *connector);
65790diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
65791index b199170..6f9e64c 100644
65792--- a/include/drm/ttm/ttm_memory.h
65793+++ b/include/drm/ttm/ttm_memory.h
65794@@ -47,7 +47,7 @@
65795
65796 struct ttm_mem_shrink {
65797 int (*do_shrink) (struct ttm_mem_shrink *);
65798-};
65799+} __no_const;
65800
65801 /**
65802 * struct ttm_mem_global - Global memory accounting structure.
65803diff --git a/include/linux/a.out.h b/include/linux/a.out.h
65804index e86dfca..40cc55f 100644
65805--- a/include/linux/a.out.h
65806+++ b/include/linux/a.out.h
65807@@ -39,6 +39,14 @@ enum machine_type {
65808 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
65809 };
65810
65811+/* Constants for the N_FLAGS field */
65812+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
65813+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
65814+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
65815+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
65816+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
65817+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
65818+
65819 #if !defined (N_MAGIC)
65820 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
65821 #endif
65822diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
65823index 817b237..62c10bc 100644
65824--- a/include/linux/atmdev.h
65825+++ b/include/linux/atmdev.h
65826@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
65827 #endif
65828
65829 struct k_atm_aal_stats {
65830-#define __HANDLE_ITEM(i) atomic_t i
65831+#define __HANDLE_ITEM(i) atomic_unchecked_t i
65832 __AAL_STAT_ITEMS
65833 #undef __HANDLE_ITEM
65834 };
65835diff --git a/include/linux/backlight.h b/include/linux/backlight.h
65836index 0f5f578..8c4f884 100644
65837--- a/include/linux/backlight.h
65838+++ b/include/linux/backlight.h
65839@@ -36,18 +36,18 @@ struct backlight_device;
65840 struct fb_info;
65841
65842 struct backlight_ops {
65843- unsigned int options;
65844+ const unsigned int options;
65845
65846 #define BL_CORE_SUSPENDRESUME (1 << 0)
65847
65848 /* Notify the backlight driver some property has changed */
65849- int (*update_status)(struct backlight_device *);
65850+ int (* const update_status)(struct backlight_device *);
65851 /* Return the current backlight brightness (accounting for power,
65852 fb_blank etc.) */
65853- int (*get_brightness)(struct backlight_device *);
65854+ int (* const get_brightness)(struct backlight_device *);
65855 /* Check if given framebuffer device is the one bound to this backlight;
65856 return 0 if not, !=0 if it is. If NULL, backlight always matches the fb. */
65857- int (*check_fb)(struct fb_info *);
65858+ int (* const check_fb)(struct fb_info *);
65859 };
65860
65861 /* This structure defines all the properties of a backlight */
65862@@ -86,7 +86,7 @@ struct backlight_device {
65863 registered this device has been unloaded, and if class_get_devdata()
65864 points to something in the body of that driver, it is also invalid. */
65865 struct mutex ops_lock;
65866- struct backlight_ops *ops;
65867+ const struct backlight_ops *ops;
65868
65869 /* The framebuffer notifier block */
65870 struct notifier_block fb_notif;
65871@@ -103,7 +103,7 @@ static inline void backlight_update_status(struct backlight_device *bd)
65872 }
65873
65874 extern struct backlight_device *backlight_device_register(const char *name,
65875- struct device *dev, void *devdata, struct backlight_ops *ops);
65876+ struct device *dev, void *devdata, const struct backlight_ops *ops);
65877 extern void backlight_device_unregister(struct backlight_device *bd);
65878 extern void backlight_force_update(struct backlight_device *bd,
65879 enum backlight_update_reason reason);
65880diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
65881index a3d802e..93a2ef4 100644
65882--- a/include/linux/binfmts.h
65883+++ b/include/linux/binfmts.h
65884@@ -18,7 +18,7 @@ struct pt_regs;
65885 #define BINPRM_BUF_SIZE 128
65886
65887 #ifdef __KERNEL__
65888-#include <linux/list.h>
65889+#include <linux/sched.h>
65890
65891 #define CORENAME_MAX_SIZE 128
65892
65893@@ -58,6 +58,7 @@ struct linux_binprm{
65894 unsigned interp_flags;
65895 unsigned interp_data;
65896 unsigned long loader, exec;
65897+ char tcomm[TASK_COMM_LEN];
65898 };
65899
65900 extern void acct_arg_size(struct linux_binprm *bprm, unsigned long pages);
65901@@ -83,6 +84,7 @@ struct linux_binfmt {
65902 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
65903 int (*load_shlib)(struct file *);
65904 int (*core_dump)(long signr, struct pt_regs *regs, struct file *file, unsigned long limit);
65905+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
65906 unsigned long min_coredump; /* minimal dump size */
65907 int hasvdso;
65908 };
65909diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
65910index 5eb6cb0..a2906d2 100644
65911--- a/include/linux/blkdev.h
65912+++ b/include/linux/blkdev.h
65913@@ -1281,7 +1281,7 @@ struct block_device_operations {
65914 int (*revalidate_disk) (struct gendisk *);
65915 int (*getgeo)(struct block_device *, struct hd_geometry *);
65916 struct module *owner;
65917-};
65918+} __do_const;
65919
65920 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
65921 unsigned long);
65922diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
65923index 3b73b99..629d21b 100644
65924--- a/include/linux/blktrace_api.h
65925+++ b/include/linux/blktrace_api.h
65926@@ -160,7 +160,7 @@ struct blk_trace {
65927 struct dentry *dir;
65928 struct dentry *dropped_file;
65929 struct dentry *msg_file;
65930- atomic_t dropped;
65931+ atomic_unchecked_t dropped;
65932 };
65933
65934 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
65935diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
65936index 83195fb..0b0f77d 100644
65937--- a/include/linux/byteorder/little_endian.h
65938+++ b/include/linux/byteorder/little_endian.h
65939@@ -42,51 +42,51 @@
65940
65941 static inline __le64 __cpu_to_le64p(const __u64 *p)
65942 {
65943- return (__force __le64)*p;
65944+ return (__force const __le64)*p;
65945 }
65946 static inline __u64 __le64_to_cpup(const __le64 *p)
65947 {
65948- return (__force __u64)*p;
65949+ return (__force const __u64)*p;
65950 }
65951 static inline __le32 __cpu_to_le32p(const __u32 *p)
65952 {
65953- return (__force __le32)*p;
65954+ return (__force const __le32)*p;
65955 }
65956 static inline __u32 __le32_to_cpup(const __le32 *p)
65957 {
65958- return (__force __u32)*p;
65959+ return (__force const __u32)*p;
65960 }
65961 static inline __le16 __cpu_to_le16p(const __u16 *p)
65962 {
65963- return (__force __le16)*p;
65964+ return (__force const __le16)*p;
65965 }
65966 static inline __u16 __le16_to_cpup(const __le16 *p)
65967 {
65968- return (__force __u16)*p;
65969+ return (__force const __u16)*p;
65970 }
65971 static inline __be64 __cpu_to_be64p(const __u64 *p)
65972 {
65973- return (__force __be64)__swab64p(p);
65974+ return (__force const __be64)__swab64p(p);
65975 }
65976 static inline __u64 __be64_to_cpup(const __be64 *p)
65977 {
65978- return __swab64p((__u64 *)p);
65979+ return __swab64p((const __u64 *)p);
65980 }
65981 static inline __be32 __cpu_to_be32p(const __u32 *p)
65982 {
65983- return (__force __be32)__swab32p(p);
65984+ return (__force const __be32)__swab32p(p);
65985 }
65986 static inline __u32 __be32_to_cpup(const __be32 *p)
65987 {
65988- return __swab32p((__u32 *)p);
65989+ return __swab32p((const __u32 *)p);
65990 }
65991 static inline __be16 __cpu_to_be16p(const __u16 *p)
65992 {
65993- return (__force __be16)__swab16p(p);
65994+ return (__force const __be16)__swab16p(p);
65995 }
65996 static inline __u16 __be16_to_cpup(const __be16 *p)
65997 {
65998- return __swab16p((__u16 *)p);
65999+ return __swab16p((const __u16 *)p);
66000 }
66001 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
66002 #define __le64_to_cpus(x) do { (void)(x); } while (0)
66003diff --git a/include/linux/cache.h b/include/linux/cache.h
66004index 97e2488..e7576b9 100644
66005--- a/include/linux/cache.h
66006+++ b/include/linux/cache.h
66007@@ -16,6 +16,10 @@
66008 #define __read_mostly
66009 #endif
66010
66011+#ifndef __read_only
66012+#define __read_only __read_mostly
66013+#endif
66014+
66015 #ifndef ____cacheline_aligned
66016 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
66017 #endif
66018diff --git a/include/linux/capability.h b/include/linux/capability.h
66019index c8f2a5f7..1618a5c 100644
66020--- a/include/linux/capability.h
66021+++ b/include/linux/capability.h
66022@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff_set;
66023 (security_real_capable_noaudit((t), (cap)) == 0)
66024
66025 extern int capable(int cap);
66026+int capable_nolog(int cap);
66027
66028 /* audit system wants to get cap info from files as well */
66029 struct dentry;
66030diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
66031index 450fa59..86019fb 100644
66032--- a/include/linux/compiler-gcc4.h
66033+++ b/include/linux/compiler-gcc4.h
66034@@ -36,4 +36,16 @@
66035 the kernel context */
66036 #define __cold __attribute__((__cold__))
66037
66038+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
66039+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
66040+#define __bos0(ptr) __bos((ptr), 0)
66041+#define __bos1(ptr) __bos((ptr), 1)
66042+
66043+#if __GNUC_MINOR__ >= 5
66044+#ifdef CONSTIFY_PLUGIN
66045+#define __no_const __attribute__((no_const))
66046+#define __do_const __attribute__((do_const))
66047+#endif
66048+#endif
66049+
66050 #endif
66051diff --git a/include/linux/compiler.h b/include/linux/compiler.h
66052index 04fb513..fd6477b 100644
66053--- a/include/linux/compiler.h
66054+++ b/include/linux/compiler.h
66055@@ -5,11 +5,14 @@
66056
66057 #ifdef __CHECKER__
66058 # define __user __attribute__((noderef, address_space(1)))
66059+# define __force_user __force __user
66060 # define __kernel /* default address space */
66061+# define __force_kernel __force __kernel
66062 # define __safe __attribute__((safe))
66063 # define __force __attribute__((force))
66064 # define __nocast __attribute__((nocast))
66065 # define __iomem __attribute__((noderef, address_space(2)))
66066+# define __force_iomem __force __iomem
66067 # define __acquires(x) __attribute__((context(x,0,1)))
66068 # define __releases(x) __attribute__((context(x,1,0)))
66069 # define __acquire(x) __context__(x,1)
66070@@ -17,13 +20,34 @@
66071 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
66072 extern void __chk_user_ptr(const volatile void __user *);
66073 extern void __chk_io_ptr(const volatile void __iomem *);
66074+#elif defined(CHECKER_PLUGIN)
66075+//# define __user
66076+//# define __force_user
66077+//# define __kernel
66078+//# define __force_kernel
66079+# define __safe
66080+# define __force
66081+# define __nocast
66082+# define __iomem
66083+# define __force_iomem
66084+# define __chk_user_ptr(x) (void)0
66085+# define __chk_io_ptr(x) (void)0
66086+# define __builtin_warning(x, y...) (1)
66087+# define __acquires(x)
66088+# define __releases(x)
66089+# define __acquire(x) (void)0
66090+# define __release(x) (void)0
66091+# define __cond_lock(x,c) (c)
66092 #else
66093 # define __user
66094+# define __force_user
66095 # define __kernel
66096+# define __force_kernel
66097 # define __safe
66098 # define __force
66099 # define __nocast
66100 # define __iomem
66101+# define __force_iomem
66102 # define __chk_user_ptr(x) (void)0
66103 # define __chk_io_ptr(x) (void)0
66104 # define __builtin_warning(x, y...) (1)
66105@@ -247,6 +271,14 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
66106 # define __attribute_const__ /* unimplemented */
66107 #endif
66108
66109+#ifndef __no_const
66110+# define __no_const
66111+#endif
66112+
66113+#ifndef __do_const
66114+# define __do_const
66115+#endif
66116+
66117 /*
66118 * Tell gcc if a function is cold. The compiler will assume any path
66119 * directly leading to the call is unlikely.
66120@@ -256,6 +288,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
66121 #define __cold
66122 #endif
66123
66124+#ifndef __alloc_size
66125+#define __alloc_size(...)
66126+#endif
66127+
66128+#ifndef __bos
66129+#define __bos(ptr, arg)
66130+#endif
66131+
66132+#ifndef __bos0
66133+#define __bos0(ptr)
66134+#endif
66135+
66136+#ifndef __bos1
66137+#define __bos1(ptr)
66138+#endif
66139+
66140 /* Simple shorthand for a section definition */
66141 #ifndef __section
66142 # define __section(S) __attribute__ ((__section__(#S)))
66143@@ -278,6 +326,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
66144 * use is to mediate communication between process-level code and irq/NMI
66145 * handlers, all running on the same CPU.
66146 */
66147-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
66148+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
66149+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
66150
66151 #endif /* __LINUX_COMPILER_H */
66152diff --git a/include/linux/crypto.h b/include/linux/crypto.h
66153index fd92988..a3164bd 100644
66154--- a/include/linux/crypto.h
66155+++ b/include/linux/crypto.h
66156@@ -394,7 +394,7 @@ struct cipher_tfm {
66157 const u8 *key, unsigned int keylen);
66158 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
66159 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
66160-};
66161+} __no_const;
66162
66163 struct hash_tfm {
66164 int (*init)(struct hash_desc *desc);
66165@@ -415,13 +415,13 @@ struct compress_tfm {
66166 int (*cot_decompress)(struct crypto_tfm *tfm,
66167 const u8 *src, unsigned int slen,
66168 u8 *dst, unsigned int *dlen);
66169-};
66170+} __no_const;
66171
66172 struct rng_tfm {
66173 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
66174 unsigned int dlen);
66175 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
66176-};
66177+} __no_const;
66178
66179 #define crt_ablkcipher crt_u.ablkcipher
66180 #define crt_aead crt_u.aead
66181diff --git a/include/linux/dcache.h b/include/linux/dcache.h
66182index 30b93b2..cd7a8db 100644
66183--- a/include/linux/dcache.h
66184+++ b/include/linux/dcache.h
66185@@ -119,6 +119,8 @@ struct dentry {
66186 unsigned char d_iname[DNAME_INLINE_LEN_MIN]; /* small names */
66187 };
66188
66189+#define DNAME_INLINE_LEN (sizeof(struct dentry)-offsetof(struct dentry,d_iname))
66190+
66191 /*
66192 * dentry->d_lock spinlock nesting subclasses:
66193 *
66194diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
66195index 3e9bd6a..f4e1aa0 100644
66196--- a/include/linux/decompress/mm.h
66197+++ b/include/linux/decompress/mm.h
66198@@ -78,7 +78,7 @@ static void free(void *where)
66199 * warnings when not needed (indeed large_malloc / large_free are not
66200 * needed by inflate */
66201
66202-#define malloc(a) kmalloc(a, GFP_KERNEL)
66203+#define malloc(a) kmalloc((a), GFP_KERNEL)
66204 #define free(a) kfree(a)
66205
66206 #define large_malloc(a) vmalloc(a)
66207diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
66208index 91b7618..92a93d32 100644
66209--- a/include/linux/dma-mapping.h
66210+++ b/include/linux/dma-mapping.h
66211@@ -16,51 +16,51 @@ enum dma_data_direction {
66212 };
66213
66214 struct dma_map_ops {
66215- void* (*alloc_coherent)(struct device *dev, size_t size,
66216+ void* (* const alloc_coherent)(struct device *dev, size_t size,
66217 dma_addr_t *dma_handle, gfp_t gfp);
66218- void (*free_coherent)(struct device *dev, size_t size,
66219+ void (* const free_coherent)(struct device *dev, size_t size,
66220 void *vaddr, dma_addr_t dma_handle);
66221- dma_addr_t (*map_page)(struct device *dev, struct page *page,
66222+ dma_addr_t (* const map_page)(struct device *dev, struct page *page,
66223 unsigned long offset, size_t size,
66224 enum dma_data_direction dir,
66225 struct dma_attrs *attrs);
66226- void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
66227+ void (* const unmap_page)(struct device *dev, dma_addr_t dma_handle,
66228 size_t size, enum dma_data_direction dir,
66229 struct dma_attrs *attrs);
66230- int (*map_sg)(struct device *dev, struct scatterlist *sg,
66231+ int (* const map_sg)(struct device *dev, struct scatterlist *sg,
66232 int nents, enum dma_data_direction dir,
66233 struct dma_attrs *attrs);
66234- void (*unmap_sg)(struct device *dev,
66235+ void (* const unmap_sg)(struct device *dev,
66236 struct scatterlist *sg, int nents,
66237 enum dma_data_direction dir,
66238 struct dma_attrs *attrs);
66239- void (*sync_single_for_cpu)(struct device *dev,
66240+ void (* const sync_single_for_cpu)(struct device *dev,
66241 dma_addr_t dma_handle, size_t size,
66242 enum dma_data_direction dir);
66243- void (*sync_single_for_device)(struct device *dev,
66244+ void (* const sync_single_for_device)(struct device *dev,
66245 dma_addr_t dma_handle, size_t size,
66246 enum dma_data_direction dir);
66247- void (*sync_single_range_for_cpu)(struct device *dev,
66248+ void (* const sync_single_range_for_cpu)(struct device *dev,
66249 dma_addr_t dma_handle,
66250 unsigned long offset,
66251 size_t size,
66252 enum dma_data_direction dir);
66253- void (*sync_single_range_for_device)(struct device *dev,
66254+ void (* const sync_single_range_for_device)(struct device *dev,
66255 dma_addr_t dma_handle,
66256 unsigned long offset,
66257 size_t size,
66258 enum dma_data_direction dir);
66259- void (*sync_sg_for_cpu)(struct device *dev,
66260+ void (* const sync_sg_for_cpu)(struct device *dev,
66261 struct scatterlist *sg, int nents,
66262 enum dma_data_direction dir);
66263- void (*sync_sg_for_device)(struct device *dev,
66264+ void (* const sync_sg_for_device)(struct device *dev,
66265 struct scatterlist *sg, int nents,
66266 enum dma_data_direction dir);
66267- int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
66268- int (*dma_supported)(struct device *dev, u64 mask);
66269+ int (* const mapping_error)(struct device *dev, dma_addr_t dma_addr);
66270+ int (* const dma_supported)(struct device *dev, u64 mask);
66271 int (*set_dma_mask)(struct device *dev, u64 mask);
66272 int is_phys;
66273-};
66274+} __do_const;
66275
66276 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
66277
66278diff --git a/include/linux/dst.h b/include/linux/dst.h
66279index e26fed8..b976d9f 100644
66280--- a/include/linux/dst.h
66281+++ b/include/linux/dst.h
66282@@ -380,7 +380,7 @@ struct dst_node
66283 struct thread_pool *pool;
66284
66285 /* Transaction IDs live here */
66286- atomic_long_t gen;
66287+ atomic_long_unchecked_t gen;
66288
66289 /*
66290 * How frequently and how many times transaction
66291diff --git a/include/linux/elf.h b/include/linux/elf.h
66292index 90a4ed0..d652617 100644
66293--- a/include/linux/elf.h
66294+++ b/include/linux/elf.h
66295@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
66296 #define PT_GNU_EH_FRAME 0x6474e550
66297
66298 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
66299+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
66300+
66301+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
66302+
66303+/* Constants for the e_flags field */
66304+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
66305+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
66306+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
66307+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
66308+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
66309+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
66310
66311 /* These constants define the different elf file types */
66312 #define ET_NONE 0
66313@@ -84,6 +95,8 @@ typedef __s64 Elf64_Sxword;
66314 #define DT_DEBUG 21
66315 #define DT_TEXTREL 22
66316 #define DT_JMPREL 23
66317+#define DT_FLAGS 30
66318+ #define DF_TEXTREL 0x00000004
66319 #define DT_ENCODING 32
66320 #define OLD_DT_LOOS 0x60000000
66321 #define DT_LOOS 0x6000000d
66322@@ -230,6 +243,19 @@ typedef struct elf64_hdr {
66323 #define PF_W 0x2
66324 #define PF_X 0x1
66325
66326+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
66327+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
66328+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
66329+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
66330+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
66331+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
66332+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
66333+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
66334+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
66335+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
66336+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
66337+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
66338+
66339 typedef struct elf32_phdr{
66340 Elf32_Word p_type;
66341 Elf32_Off p_offset;
66342@@ -322,6 +348,8 @@ typedef struct elf64_shdr {
66343 #define EI_OSABI 7
66344 #define EI_PAD 8
66345
66346+#define EI_PAX 14
66347+
66348 #define ELFMAG0 0x7f /* EI_MAG */
66349 #define ELFMAG1 'E'
66350 #define ELFMAG2 'L'
66351@@ -386,6 +414,7 @@ extern Elf32_Dyn _DYNAMIC [];
66352 #define elf_phdr elf32_phdr
66353 #define elf_note elf32_note
66354 #define elf_addr_t Elf32_Off
66355+#define elf_dyn Elf32_Dyn
66356
66357 #else
66358
66359@@ -394,6 +423,7 @@ extern Elf64_Dyn _DYNAMIC [];
66360 #define elf_phdr elf64_phdr
66361 #define elf_note elf64_note
66362 #define elf_addr_t Elf64_Off
66363+#define elf_dyn Elf64_Dyn
66364
66365 #endif
66366
66367diff --git a/include/linux/fs.h b/include/linux/fs.h
66368index 1b9a47a..6fe2934 100644
66369--- a/include/linux/fs.h
66370+++ b/include/linux/fs.h
66371@@ -568,41 +568,41 @@ typedef int (*read_actor_t)(read_descriptor_t *, struct page *,
66372 unsigned long, unsigned long);
66373
66374 struct address_space_operations {
66375- int (*writepage)(struct page *page, struct writeback_control *wbc);
66376- int (*readpage)(struct file *, struct page *);
66377- void (*sync_page)(struct page *);
66378+ int (* const writepage)(struct page *page, struct writeback_control *wbc);
66379+ int (* const readpage)(struct file *, struct page *);
66380+ void (* const sync_page)(struct page *);
66381
66382 /* Write back some dirty pages from this mapping. */
66383- int (*writepages)(struct address_space *, struct writeback_control *);
66384+ int (* const writepages)(struct address_space *, struct writeback_control *);
66385
66386 /* Set a page dirty. Return true if this dirtied it */
66387- int (*set_page_dirty)(struct page *page);
66388+ int (* const set_page_dirty)(struct page *page);
66389
66390- int (*readpages)(struct file *filp, struct address_space *mapping,
66391+ int (* const readpages)(struct file *filp, struct address_space *mapping,
66392 struct list_head *pages, unsigned nr_pages);
66393
66394- int (*write_begin)(struct file *, struct address_space *mapping,
66395+ int (* const write_begin)(struct file *, struct address_space *mapping,
66396 loff_t pos, unsigned len, unsigned flags,
66397 struct page **pagep, void **fsdata);
66398- int (*write_end)(struct file *, struct address_space *mapping,
66399+ int (* const write_end)(struct file *, struct address_space *mapping,
66400 loff_t pos, unsigned len, unsigned copied,
66401 struct page *page, void *fsdata);
66402
66403 /* Unfortunately this kludge is needed for FIBMAP. Don't use it */
66404- sector_t (*bmap)(struct address_space *, sector_t);
66405- void (*invalidatepage) (struct page *, unsigned long);
66406- int (*releasepage) (struct page *, gfp_t);
66407- ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
66408+ sector_t (* const bmap)(struct address_space *, sector_t);
66409+ void (* const invalidatepage) (struct page *, unsigned long);
66410+ int (* const releasepage) (struct page *, gfp_t);
66411+ ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov,
66412 loff_t offset, unsigned long nr_segs);
66413- int (*get_xip_mem)(struct address_space *, pgoff_t, int,
66414+ int (* const get_xip_mem)(struct address_space *, pgoff_t, int,
66415 void **, unsigned long *);
66416 /* migrate the contents of a page to the specified target */
66417- int (*migratepage) (struct address_space *,
66418+ int (* const migratepage) (struct address_space *,
66419 struct page *, struct page *);
66420- int (*launder_page) (struct page *);
66421- int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
66422+ int (* const launder_page) (struct page *);
66423+ int (* const is_partially_uptodate) (struct page *, read_descriptor_t *,
66424 unsigned long);
66425- int (*error_remove_page)(struct address_space *, struct page *);
66426+ int (* const error_remove_page)(struct address_space *, struct page *);
66427 };
66428
66429 /*
66430@@ -1031,19 +1031,19 @@ static inline int file_check_writeable(struct file *filp)
66431 typedef struct files_struct *fl_owner_t;
66432
66433 struct file_lock_operations {
66434- void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
66435- void (*fl_release_private)(struct file_lock *);
66436+ void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
66437+ void (* const fl_release_private)(struct file_lock *);
66438 };
66439
66440 struct lock_manager_operations {
66441- int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
66442- void (*fl_notify)(struct file_lock *); /* unblock callback */
66443- int (*fl_grant)(struct file_lock *, struct file_lock *, int);
66444- void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
66445- void (*fl_release_private)(struct file_lock *);
66446- void (*fl_break)(struct file_lock *);
66447- int (*fl_mylease)(struct file_lock *, struct file_lock *);
66448- int (*fl_change)(struct file_lock **, int);
66449+ int (* const fl_compare_owner)(struct file_lock *, struct file_lock *);
66450+ void (* const fl_notify)(struct file_lock *); /* unblock callback */
66451+ int (* const fl_grant)(struct file_lock *, struct file_lock *, int);
66452+ void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
66453+ void (* const fl_release_private)(struct file_lock *);
66454+ void (* const fl_break)(struct file_lock *);
66455+ int (* const fl_mylease)(struct file_lock *, struct file_lock *);
66456+ int (* const fl_change)(struct file_lock **, int);
66457 };
66458
66459 struct lock_manager {
66460@@ -1442,7 +1442,7 @@ struct fiemap_extent_info {
66461 unsigned int fi_flags; /* Flags as passed from user */
66462 unsigned int fi_extents_mapped; /* Number of mapped extents */
66463 unsigned int fi_extents_max; /* Size of fiemap_extent array */
66464- struct fiemap_extent *fi_extents_start; /* Start of fiemap_extent
66465+ struct fiemap_extent __user *fi_extents_start; /* Start of fiemap_extent
66466 * array */
66467 };
66468 int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
66469@@ -1512,7 +1512,8 @@ struct file_operations {
66470 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
66471 ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
66472 int (*setlease)(struct file *, long, struct file_lock **);
66473-};
66474+} __do_const;
66475+typedef struct file_operations __no_const file_operations_no_const;
66476
66477 struct inode_operations {
66478 int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
66479@@ -1559,30 +1560,30 @@ extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
66480 unsigned long, loff_t *);
66481
66482 struct super_operations {
66483- struct inode *(*alloc_inode)(struct super_block *sb);
66484- void (*destroy_inode)(struct inode *);
66485+ struct inode *(* const alloc_inode)(struct super_block *sb);
66486+ void (* const destroy_inode)(struct inode *);
66487
66488- void (*dirty_inode) (struct inode *);
66489- int (*write_inode) (struct inode *, int);
66490- void (*drop_inode) (struct inode *);
66491- void (*delete_inode) (struct inode *);
66492- void (*put_super) (struct super_block *);
66493- void (*write_super) (struct super_block *);
66494- int (*sync_fs)(struct super_block *sb, int wait);
66495- int (*freeze_fs) (struct super_block *);
66496- int (*unfreeze_fs) (struct super_block *);
66497- int (*statfs) (struct dentry *, struct kstatfs *);
66498- int (*remount_fs) (struct super_block *, int *, char *);
66499- void (*clear_inode) (struct inode *);
66500- void (*umount_begin) (struct super_block *);
66501+ void (* const dirty_inode) (struct inode *);
66502+ int (* const write_inode) (struct inode *, int);
66503+ void (* const drop_inode) (struct inode *);
66504+ void (* const delete_inode) (struct inode *);
66505+ void (* const put_super) (struct super_block *);
66506+ void (* const write_super) (struct super_block *);
66507+ int (* const sync_fs)(struct super_block *sb, int wait);
66508+ int (* const freeze_fs) (struct super_block *);
66509+ int (* const unfreeze_fs) (struct super_block *);
66510+ int (* const statfs) (struct dentry *, struct kstatfs *);
66511+ int (* const remount_fs) (struct super_block *, int *, char *);
66512+ void (* const clear_inode) (struct inode *);
66513+ void (* const umount_begin) (struct super_block *);
66514
66515- int (*show_options)(struct seq_file *, struct vfsmount *);
66516- int (*show_stats)(struct seq_file *, struct vfsmount *);
66517+ int (* const show_options)(struct seq_file *, struct vfsmount *);
66518+ int (* const show_stats)(struct seq_file *, struct vfsmount *);
66519 #ifdef CONFIG_QUOTA
66520- ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
66521- ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
66522+ ssize_t (* const quota_read)(struct super_block *, int, char *, size_t, loff_t);
66523+ ssize_t (* const quota_write)(struct super_block *, int, const char *, size_t, loff_t);
66524 #endif
66525- int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
66526+ int (* const bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
66527 };
66528
66529 /*
66530diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
66531index 78a05bf..2a7d3e1 100644
66532--- a/include/linux/fs_struct.h
66533+++ b/include/linux/fs_struct.h
66534@@ -4,7 +4,7 @@
66535 #include <linux/path.h>
66536
66537 struct fs_struct {
66538- int users;
66539+ atomic_t users;
66540 rwlock_t lock;
66541 int umask;
66542 int in_exec;
66543diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
66544index 7be0c6f..2f63a2b 100644
66545--- a/include/linux/fscache-cache.h
66546+++ b/include/linux/fscache-cache.h
66547@@ -116,7 +116,7 @@ struct fscache_operation {
66548 #endif
66549 };
66550
66551-extern atomic_t fscache_op_debug_id;
66552+extern atomic_unchecked_t fscache_op_debug_id;
66553 extern const struct slow_work_ops fscache_op_slow_work_ops;
66554
66555 extern void fscache_enqueue_operation(struct fscache_operation *);
66556@@ -134,7 +134,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
66557 fscache_operation_release_t release)
66558 {
66559 atomic_set(&op->usage, 1);
66560- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
66561+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
66562 op->release = release;
66563 INIT_LIST_HEAD(&op->pend_link);
66564 fscache_set_op_state(op, "Init");
66565diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
66566index 4d6f47b..00bcedb 100644
66567--- a/include/linux/fsnotify_backend.h
66568+++ b/include/linux/fsnotify_backend.h
66569@@ -86,6 +86,7 @@ struct fsnotify_ops {
66570 void (*freeing_mark)(struct fsnotify_mark_entry *entry, struct fsnotify_group *group);
66571 void (*free_event_priv)(struct fsnotify_event_private_data *priv);
66572 };
66573+typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
66574
66575 /*
66576 * A group is a "thing" that wants to receive notification about filesystem
66577diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
66578index 4ec5e67..42f1eb9 100644
66579--- a/include/linux/ftrace_event.h
66580+++ b/include/linux/ftrace_event.h
66581@@ -163,7 +163,7 @@ extern int trace_define_field(struct ftrace_event_call *call,
66582 int filter_type);
66583 extern int trace_define_common_fields(struct ftrace_event_call *call);
66584
66585-#define is_signed_type(type) (((type)(-1)) < 0)
66586+#define is_signed_type(type) (((type)(-1)) < (type)1)
66587
66588 int trace_set_clr_event(const char *system, const char *event, int set);
66589
66590diff --git a/include/linux/genhd.h b/include/linux/genhd.h
66591index 297df45..b6a74ff 100644
66592--- a/include/linux/genhd.h
66593+++ b/include/linux/genhd.h
66594@@ -161,7 +161,7 @@ struct gendisk {
66595
66596 struct timer_rand_state *random;
66597
66598- atomic_t sync_io; /* RAID */
66599+ atomic_unchecked_t sync_io; /* RAID */
66600 struct work_struct async_notify;
66601 #ifdef CONFIG_BLK_DEV_INTEGRITY
66602 struct blk_integrity *integrity;
66603diff --git a/include/linux/gracl.h b/include/linux/gracl.h
66604new file mode 100644
66605index 0000000..0dc3943
66606--- /dev/null
66607+++ b/include/linux/gracl.h
66608@@ -0,0 +1,317 @@
66609+#ifndef GR_ACL_H
66610+#define GR_ACL_H
66611+
66612+#include <linux/grdefs.h>
66613+#include <linux/resource.h>
66614+#include <linux/capability.h>
66615+#include <linux/dcache.h>
66616+#include <asm/resource.h>
66617+
66618+/* Major status information */
66619+
66620+#define GR_VERSION "grsecurity 2.2.2"
66621+#define GRSECURITY_VERSION 0x2202
66622+
66623+enum {
66624+ GR_SHUTDOWN = 0,
66625+ GR_ENABLE = 1,
66626+ GR_SPROLE = 2,
66627+ GR_RELOAD = 3,
66628+ GR_SEGVMOD = 4,
66629+ GR_STATUS = 5,
66630+ GR_UNSPROLE = 6,
66631+ GR_PASSSET = 7,
66632+ GR_SPROLEPAM = 8,
66633+};
66634+
66635+/* Password setup definitions
66636+ * kernel/grhash.c */
66637+enum {
66638+ GR_PW_LEN = 128,
66639+ GR_SALT_LEN = 16,
66640+ GR_SHA_LEN = 32,
66641+};
66642+
66643+enum {
66644+ GR_SPROLE_LEN = 64,
66645+};
66646+
66647+enum {
66648+ GR_NO_GLOB = 0,
66649+ GR_REG_GLOB,
66650+ GR_CREATE_GLOB
66651+};
66652+
66653+#define GR_NLIMITS 32
66654+
66655+/* Begin Data Structures */
66656+
66657+struct sprole_pw {
66658+ unsigned char *rolename;
66659+ unsigned char salt[GR_SALT_LEN];
66660+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
66661+};
66662+
66663+struct name_entry {
66664+ __u32 key;
66665+ ino_t inode;
66666+ dev_t device;
66667+ char *name;
66668+ __u16 len;
66669+ __u8 deleted;
66670+ struct name_entry *prev;
66671+ struct name_entry *next;
66672+};
66673+
66674+struct inodev_entry {
66675+ struct name_entry *nentry;
66676+ struct inodev_entry *prev;
66677+ struct inodev_entry *next;
66678+};
66679+
66680+struct acl_role_db {
66681+ struct acl_role_label **r_hash;
66682+ __u32 r_size;
66683+};
66684+
66685+struct inodev_db {
66686+ struct inodev_entry **i_hash;
66687+ __u32 i_size;
66688+};
66689+
66690+struct name_db {
66691+ struct name_entry **n_hash;
66692+ __u32 n_size;
66693+};
66694+
66695+struct crash_uid {
66696+ uid_t uid;
66697+ unsigned long expires;
66698+};
66699+
66700+struct gr_hash_struct {
66701+ void **table;
66702+ void **nametable;
66703+ void *first;
66704+ __u32 table_size;
66705+ __u32 used_size;
66706+ int type;
66707+};
66708+
66709+/* Userspace Grsecurity ACL data structures */
66710+
66711+struct acl_subject_label {
66712+ char *filename;
66713+ ino_t inode;
66714+ dev_t device;
66715+ __u32 mode;
66716+ kernel_cap_t cap_mask;
66717+ kernel_cap_t cap_lower;
66718+ kernel_cap_t cap_invert_audit;
66719+
66720+ struct rlimit res[GR_NLIMITS];
66721+ __u32 resmask;
66722+
66723+ __u8 user_trans_type;
66724+ __u8 group_trans_type;
66725+ uid_t *user_transitions;
66726+ gid_t *group_transitions;
66727+ __u16 user_trans_num;
66728+ __u16 group_trans_num;
66729+
66730+ __u32 sock_families[2];
66731+ __u32 ip_proto[8];
66732+ __u32 ip_type;
66733+ struct acl_ip_label **ips;
66734+ __u32 ip_num;
66735+ __u32 inaddr_any_override;
66736+
66737+ __u32 crashes;
66738+ unsigned long expires;
66739+
66740+ struct acl_subject_label *parent_subject;
66741+ struct gr_hash_struct *hash;
66742+ struct acl_subject_label *prev;
66743+ struct acl_subject_label *next;
66744+
66745+ struct acl_object_label **obj_hash;
66746+ __u32 obj_hash_size;
66747+ __u16 pax_flags;
66748+};
66749+
66750+struct role_allowed_ip {
66751+ __u32 addr;
66752+ __u32 netmask;
66753+
66754+ struct role_allowed_ip *prev;
66755+ struct role_allowed_ip *next;
66756+};
66757+
66758+struct role_transition {
66759+ char *rolename;
66760+
66761+ struct role_transition *prev;
66762+ struct role_transition *next;
66763+};
66764+
66765+struct acl_role_label {
66766+ char *rolename;
66767+ uid_t uidgid;
66768+ __u16 roletype;
66769+
66770+ __u16 auth_attempts;
66771+ unsigned long expires;
66772+
66773+ struct acl_subject_label *root_label;
66774+ struct gr_hash_struct *hash;
66775+
66776+ struct acl_role_label *prev;
66777+ struct acl_role_label *next;
66778+
66779+ struct role_transition *transitions;
66780+ struct role_allowed_ip *allowed_ips;
66781+ uid_t *domain_children;
66782+ __u16 domain_child_num;
66783+
66784+ struct acl_subject_label **subj_hash;
66785+ __u32 subj_hash_size;
66786+};
66787+
66788+struct user_acl_role_db {
66789+ struct acl_role_label **r_table;
66790+ __u32 num_pointers; /* Number of allocations to track */
66791+ __u32 num_roles; /* Number of roles */
66792+ __u32 num_domain_children; /* Number of domain children */
66793+ __u32 num_subjects; /* Number of subjects */
66794+ __u32 num_objects; /* Number of objects */
66795+};
66796+
66797+struct acl_object_label {
66798+ char *filename;
66799+ ino_t inode;
66800+ dev_t device;
66801+ __u32 mode;
66802+
66803+ struct acl_subject_label *nested;
66804+ struct acl_object_label *globbed;
66805+
66806+ /* next two structures not used */
66807+
66808+ struct acl_object_label *prev;
66809+ struct acl_object_label *next;
66810+};
66811+
66812+struct acl_ip_label {
66813+ char *iface;
66814+ __u32 addr;
66815+ __u32 netmask;
66816+ __u16 low, high;
66817+ __u8 mode;
66818+ __u32 type;
66819+ __u32 proto[8];
66820+
66821+ /* next two structures not used */
66822+
66823+ struct acl_ip_label *prev;
66824+ struct acl_ip_label *next;
66825+};
66826+
66827+struct gr_arg {
66828+ struct user_acl_role_db role_db;
66829+ unsigned char pw[GR_PW_LEN];
66830+ unsigned char salt[GR_SALT_LEN];
66831+ unsigned char sum[GR_SHA_LEN];
66832+ unsigned char sp_role[GR_SPROLE_LEN];
66833+ struct sprole_pw *sprole_pws;
66834+ dev_t segv_device;
66835+ ino_t segv_inode;
66836+ uid_t segv_uid;
66837+ __u16 num_sprole_pws;
66838+ __u16 mode;
66839+};
66840+
66841+struct gr_arg_wrapper {
66842+ struct gr_arg *arg;
66843+ __u32 version;
66844+ __u32 size;
66845+};
66846+
66847+struct subject_map {
66848+ struct acl_subject_label *user;
66849+ struct acl_subject_label *kernel;
66850+ struct subject_map *prev;
66851+ struct subject_map *next;
66852+};
66853+
66854+struct acl_subj_map_db {
66855+ struct subject_map **s_hash;
66856+ __u32 s_size;
66857+};
66858+
66859+/* End Data Structures Section */
66860+
66861+/* Hash functions generated by empirical testing by Brad Spengler
66862+ Makes good use of the low bits of the inode. Generally 0-1 times
66863+ in loop for successful match. 0-3 for unsuccessful match.
66864+ Shift/add algorithm with modulus of table size and an XOR*/
66865+
66866+static __inline__ unsigned int
66867+rhash(const uid_t uid, const __u16 type, const unsigned int sz)
66868+{
66869+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
66870+}
66871+
66872+ static __inline__ unsigned int
66873+shash(const struct acl_subject_label *userp, const unsigned int sz)
66874+{
66875+ return ((const unsigned long)userp % sz);
66876+}
66877+
66878+static __inline__ unsigned int
66879+fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
66880+{
66881+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
66882+}
66883+
66884+static __inline__ unsigned int
66885+nhash(const char *name, const __u16 len, const unsigned int sz)
66886+{
66887+ return full_name_hash((const unsigned char *)name, len) % sz;
66888+}
66889+
66890+#define FOR_EACH_ROLE_START(role) \
66891+ role = role_list; \
66892+ while (role) {
66893+
66894+#define FOR_EACH_ROLE_END(role) \
66895+ role = role->prev; \
66896+ }
66897+
66898+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
66899+ subj = NULL; \
66900+ iter = 0; \
66901+ while (iter < role->subj_hash_size) { \
66902+ if (subj == NULL) \
66903+ subj = role->subj_hash[iter]; \
66904+ if (subj == NULL) { \
66905+ iter++; \
66906+ continue; \
66907+ }
66908+
66909+#define FOR_EACH_SUBJECT_END(subj,iter) \
66910+ subj = subj->next; \
66911+ if (subj == NULL) \
66912+ iter++; \
66913+ }
66914+
66915+
66916+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
66917+ subj = role->hash->first; \
66918+ while (subj != NULL) {
66919+
66920+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
66921+ subj = subj->next; \
66922+ }
66923+
66924+#endif
66925+
66926diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
66927new file mode 100644
66928index 0000000..323ecf2
66929--- /dev/null
66930+++ b/include/linux/gralloc.h
66931@@ -0,0 +1,9 @@
66932+#ifndef __GRALLOC_H
66933+#define __GRALLOC_H
66934+
66935+void acl_free_all(void);
66936+int acl_alloc_stack_init(unsigned long size);
66937+void *acl_alloc(unsigned long len);
66938+void *acl_alloc_num(unsigned long num, unsigned long len);
66939+
66940+#endif
66941diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
66942new file mode 100644
66943index 0000000..70d6cd5
66944--- /dev/null
66945+++ b/include/linux/grdefs.h
66946@@ -0,0 +1,140 @@
66947+#ifndef GRDEFS_H
66948+#define GRDEFS_H
66949+
66950+/* Begin grsecurity status declarations */
66951+
66952+enum {
66953+ GR_READY = 0x01,
66954+ GR_STATUS_INIT = 0x00 // disabled state
66955+};
66956+
66957+/* Begin ACL declarations */
66958+
66959+/* Role flags */
66960+
66961+enum {
66962+ GR_ROLE_USER = 0x0001,
66963+ GR_ROLE_GROUP = 0x0002,
66964+ GR_ROLE_DEFAULT = 0x0004,
66965+ GR_ROLE_SPECIAL = 0x0008,
66966+ GR_ROLE_AUTH = 0x0010,
66967+ GR_ROLE_NOPW = 0x0020,
66968+ GR_ROLE_GOD = 0x0040,
66969+ GR_ROLE_LEARN = 0x0080,
66970+ GR_ROLE_TPE = 0x0100,
66971+ GR_ROLE_DOMAIN = 0x0200,
66972+ GR_ROLE_PAM = 0x0400,
66973+ GR_ROLE_PERSIST = 0x800
66974+};
66975+
66976+/* ACL Subject and Object mode flags */
66977+enum {
66978+ GR_DELETED = 0x80000000
66979+};
66980+
66981+/* ACL Object-only mode flags */
66982+enum {
66983+ GR_READ = 0x00000001,
66984+ GR_APPEND = 0x00000002,
66985+ GR_WRITE = 0x00000004,
66986+ GR_EXEC = 0x00000008,
66987+ GR_FIND = 0x00000010,
66988+ GR_INHERIT = 0x00000020,
66989+ GR_SETID = 0x00000040,
66990+ GR_CREATE = 0x00000080,
66991+ GR_DELETE = 0x00000100,
66992+ GR_LINK = 0x00000200,
66993+ GR_AUDIT_READ = 0x00000400,
66994+ GR_AUDIT_APPEND = 0x00000800,
66995+ GR_AUDIT_WRITE = 0x00001000,
66996+ GR_AUDIT_EXEC = 0x00002000,
66997+ GR_AUDIT_FIND = 0x00004000,
66998+ GR_AUDIT_INHERIT= 0x00008000,
66999+ GR_AUDIT_SETID = 0x00010000,
67000+ GR_AUDIT_CREATE = 0x00020000,
67001+ GR_AUDIT_DELETE = 0x00040000,
67002+ GR_AUDIT_LINK = 0x00080000,
67003+ GR_PTRACERD = 0x00100000,
67004+ GR_NOPTRACE = 0x00200000,
67005+ GR_SUPPRESS = 0x00400000,
67006+ GR_NOLEARN = 0x00800000,
67007+ GR_INIT_TRANSFER= 0x01000000
67008+};
67009+
67010+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
67011+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
67012+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
67013+
67014+/* ACL subject-only mode flags */
67015+enum {
67016+ GR_KILL = 0x00000001,
67017+ GR_VIEW = 0x00000002,
67018+ GR_PROTECTED = 0x00000004,
67019+ GR_LEARN = 0x00000008,
67020+ GR_OVERRIDE = 0x00000010,
67021+ /* just a placeholder, this mode is only used in userspace */
67022+ GR_DUMMY = 0x00000020,
67023+ GR_PROTSHM = 0x00000040,
67024+ GR_KILLPROC = 0x00000080,
67025+ GR_KILLIPPROC = 0x00000100,
67026+ /* just a placeholder, this mode is only used in userspace */
67027+ GR_NOTROJAN = 0x00000200,
67028+ GR_PROTPROCFD = 0x00000400,
67029+ GR_PROCACCT = 0x00000800,
67030+ GR_RELAXPTRACE = 0x00001000,
67031+ GR_NESTED = 0x00002000,
67032+ GR_INHERITLEARN = 0x00004000,
67033+ GR_PROCFIND = 0x00008000,
67034+ GR_POVERRIDE = 0x00010000,
67035+ GR_KERNELAUTH = 0x00020000,
67036+ GR_ATSECURE = 0x00040000,
67037+ GR_SHMEXEC = 0x00080000
67038+};
67039+
67040+enum {
67041+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
67042+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
67043+ GR_PAX_ENABLE_MPROTECT = 0x0004,
67044+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
67045+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
67046+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
67047+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
67048+ GR_PAX_DISABLE_MPROTECT = 0x0400,
67049+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
67050+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
67051+};
67052+
67053+enum {
67054+ GR_ID_USER = 0x01,
67055+ GR_ID_GROUP = 0x02,
67056+};
67057+
67058+enum {
67059+ GR_ID_ALLOW = 0x01,
67060+ GR_ID_DENY = 0x02,
67061+};
67062+
67063+#define GR_CRASH_RES 31
67064+#define GR_UIDTABLE_MAX 500
67065+
67066+/* begin resource learning section */
67067+enum {
67068+ GR_RLIM_CPU_BUMP = 60,
67069+ GR_RLIM_FSIZE_BUMP = 50000,
67070+ GR_RLIM_DATA_BUMP = 10000,
67071+ GR_RLIM_STACK_BUMP = 1000,
67072+ GR_RLIM_CORE_BUMP = 10000,
67073+ GR_RLIM_RSS_BUMP = 500000,
67074+ GR_RLIM_NPROC_BUMP = 1,
67075+ GR_RLIM_NOFILE_BUMP = 5,
67076+ GR_RLIM_MEMLOCK_BUMP = 50000,
67077+ GR_RLIM_AS_BUMP = 500000,
67078+ GR_RLIM_LOCKS_BUMP = 2,
67079+ GR_RLIM_SIGPENDING_BUMP = 5,
67080+ GR_RLIM_MSGQUEUE_BUMP = 10000,
67081+ GR_RLIM_NICE_BUMP = 1,
67082+ GR_RLIM_RTPRIO_BUMP = 1,
67083+ GR_RLIM_RTTIME_BUMP = 1000000
67084+};
67085+
67086+#endif
67087diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
67088new file mode 100644
67089index 0000000..3826b91
67090--- /dev/null
67091+++ b/include/linux/grinternal.h
67092@@ -0,0 +1,219 @@
67093+#ifndef __GRINTERNAL_H
67094+#define __GRINTERNAL_H
67095+
67096+#ifdef CONFIG_GRKERNSEC
67097+
67098+#include <linux/fs.h>
67099+#include <linux/mnt_namespace.h>
67100+#include <linux/nsproxy.h>
67101+#include <linux/gracl.h>
67102+#include <linux/grdefs.h>
67103+#include <linux/grmsg.h>
67104+
67105+void gr_add_learn_entry(const char *fmt, ...)
67106+ __attribute__ ((format (printf, 1, 2)));
67107+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
67108+ const struct vfsmount *mnt);
67109+__u32 gr_check_create(const struct dentry *new_dentry,
67110+ const struct dentry *parent,
67111+ const struct vfsmount *mnt, const __u32 mode);
67112+int gr_check_protected_task(const struct task_struct *task);
67113+__u32 to_gr_audit(const __u32 reqmode);
67114+int gr_set_acls(const int type);
67115+int gr_apply_subject_to_task(struct task_struct *task);
67116+int gr_acl_is_enabled(void);
67117+char gr_roletype_to_char(void);
67118+
67119+void gr_handle_alertkill(struct task_struct *task);
67120+char *gr_to_filename(const struct dentry *dentry,
67121+ const struct vfsmount *mnt);
67122+char *gr_to_filename1(const struct dentry *dentry,
67123+ const struct vfsmount *mnt);
67124+char *gr_to_filename2(const struct dentry *dentry,
67125+ const struct vfsmount *mnt);
67126+char *gr_to_filename3(const struct dentry *dentry,
67127+ const struct vfsmount *mnt);
67128+
67129+extern int grsec_enable_ptrace_readexec;
67130+extern int grsec_enable_harden_ptrace;
67131+extern int grsec_enable_link;
67132+extern int grsec_enable_fifo;
67133+extern int grsec_enable_shm;
67134+extern int grsec_enable_execlog;
67135+extern int grsec_enable_signal;
67136+extern int grsec_enable_audit_ptrace;
67137+extern int grsec_enable_forkfail;
67138+extern int grsec_enable_time;
67139+extern int grsec_enable_rofs;
67140+extern int grsec_enable_chroot_shmat;
67141+extern int grsec_enable_chroot_mount;
67142+extern int grsec_enable_chroot_double;
67143+extern int grsec_enable_chroot_pivot;
67144+extern int grsec_enable_chroot_chdir;
67145+extern int grsec_enable_chroot_chmod;
67146+extern int grsec_enable_chroot_mknod;
67147+extern int grsec_enable_chroot_fchdir;
67148+extern int grsec_enable_chroot_nice;
67149+extern int grsec_enable_chroot_execlog;
67150+extern int grsec_enable_chroot_caps;
67151+extern int grsec_enable_chroot_sysctl;
67152+extern int grsec_enable_chroot_unix;
67153+extern int grsec_enable_tpe;
67154+extern int grsec_tpe_gid;
67155+extern int grsec_enable_tpe_all;
67156+extern int grsec_enable_tpe_invert;
67157+extern int grsec_enable_socket_all;
67158+extern int grsec_socket_all_gid;
67159+extern int grsec_enable_socket_client;
67160+extern int grsec_socket_client_gid;
67161+extern int grsec_enable_socket_server;
67162+extern int grsec_socket_server_gid;
67163+extern int grsec_audit_gid;
67164+extern int grsec_enable_group;
67165+extern int grsec_enable_audit_textrel;
67166+extern int grsec_enable_log_rwxmaps;
67167+extern int grsec_enable_mount;
67168+extern int grsec_enable_chdir;
67169+extern int grsec_resource_logging;
67170+extern int grsec_enable_blackhole;
67171+extern int grsec_lastack_retries;
67172+extern int grsec_enable_brute;
67173+extern int grsec_lock;
67174+
67175+extern spinlock_t grsec_alert_lock;
67176+extern unsigned long grsec_alert_wtime;
67177+extern unsigned long grsec_alert_fyet;
67178+
67179+extern spinlock_t grsec_audit_lock;
67180+
67181+extern rwlock_t grsec_exec_file_lock;
67182+
67183+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
67184+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
67185+ (tsk)->exec_file->f_vfsmnt) : "/")
67186+
67187+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
67188+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
67189+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
67190+
67191+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
67192+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
67193+ (tsk)->exec_file->f_vfsmnt) : "/")
67194+
67195+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
67196+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
67197+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
67198+
67199+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
67200+
67201+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
67202+
67203+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
67204+ (task)->pid, (cred)->uid, \
67205+ (cred)->euid, (cred)->gid, (cred)->egid, \
67206+ gr_parent_task_fullpath(task), \
67207+ (task)->real_parent->comm, (task)->real_parent->pid, \
67208+ (pcred)->uid, (pcred)->euid, \
67209+ (pcred)->gid, (pcred)->egid
67210+
67211+#define GR_CHROOT_CAPS {{ \
67212+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
67213+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
67214+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
67215+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
67216+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
67217+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
67218+ CAP_TO_MASK(CAP_MAC_ADMIN) }}
67219+
67220+#define security_learn(normal_msg,args...) \
67221+({ \
67222+ read_lock(&grsec_exec_file_lock); \
67223+ gr_add_learn_entry(normal_msg "\n", ## args); \
67224+ read_unlock(&grsec_exec_file_lock); \
67225+})
67226+
67227+enum {
67228+ GR_DO_AUDIT,
67229+ GR_DONT_AUDIT,
67230+ GR_DONT_AUDIT_GOOD
67231+};
67232+
67233+enum {
67234+ GR_TTYSNIFF,
67235+ GR_RBAC,
67236+ GR_RBAC_STR,
67237+ GR_STR_RBAC,
67238+ GR_RBAC_MODE2,
67239+ GR_RBAC_MODE3,
67240+ GR_FILENAME,
67241+ GR_SYSCTL_HIDDEN,
67242+ GR_NOARGS,
67243+ GR_ONE_INT,
67244+ GR_ONE_INT_TWO_STR,
67245+ GR_ONE_STR,
67246+ GR_STR_INT,
67247+ GR_TWO_STR_INT,
67248+ GR_TWO_INT,
67249+ GR_TWO_U64,
67250+ GR_THREE_INT,
67251+ GR_FIVE_INT_TWO_STR,
67252+ GR_TWO_STR,
67253+ GR_THREE_STR,
67254+ GR_FOUR_STR,
67255+ GR_STR_FILENAME,
67256+ GR_FILENAME_STR,
67257+ GR_FILENAME_TWO_INT,
67258+ GR_FILENAME_TWO_INT_STR,
67259+ GR_TEXTREL,
67260+ GR_PTRACE,
67261+ GR_RESOURCE,
67262+ GR_CAP,
67263+ GR_SIG,
67264+ GR_SIG2,
67265+ GR_CRASH1,
67266+ GR_CRASH2,
67267+ GR_PSACCT,
67268+ GR_RWXMAP
67269+};
67270+
67271+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
67272+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
67273+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
67274+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
67275+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
67276+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
67277+#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)
67278+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
67279+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
67280+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
67281+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
67282+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
67283+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
67284+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
67285+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
67286+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
67287+#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)
67288+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
67289+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
67290+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
67291+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
67292+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
67293+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
67294+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
67295+#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)
67296+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
67297+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
67298+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
67299+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
67300+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
67301+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
67302+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
67303+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
67304+#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)
67305+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
67306+
67307+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
67308+
67309+#endif
67310+
67311+#endif
67312diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
67313new file mode 100644
67314index 0000000..8b9ed56
67315--- /dev/null
67316+++ b/include/linux/grmsg.h
67317@@ -0,0 +1,110 @@
67318+#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"
67319+#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"
67320+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
67321+#define GR_STOPMOD_MSG "denied modification of module state by "
67322+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
67323+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
67324+#define GR_IOPERM_MSG "denied use of ioperm() by "
67325+#define GR_IOPL_MSG "denied use of iopl() by "
67326+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
67327+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
67328+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
67329+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
67330+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
67331+#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"
67332+#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"
67333+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
67334+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
67335+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
67336+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
67337+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
67338+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
67339+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
67340+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
67341+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
67342+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
67343+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
67344+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
67345+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
67346+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
67347+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
67348+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
67349+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
67350+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
67351+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
67352+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
67353+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
67354+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
67355+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
67356+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
67357+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
67358+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
67359+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
67360+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
67361+#define GR_FCHMOD_ACL_MSG "%s fchmod of %.950s by "
67362+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
67363+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
67364+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
67365+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
67366+#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
67367+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
67368+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
67369+#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"
67370+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbaged by "
67371+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
67372+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
67373+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
67374+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
67375+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
67376+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
67377+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
67378+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
67379+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
67380+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
67381+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
67382+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
67383+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
67384+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
67385+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
67386+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
67387+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
67388+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
67389+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
67390+#define GR_FAILFORK_MSG "failed fork with errno %s by "
67391+#define GR_NICE_CHROOT_MSG "denied priority change by "
67392+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
67393+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
67394+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
67395+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
67396+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
67397+#define GR_TIME_MSG "time set by "
67398+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
67399+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
67400+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
67401+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
67402+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
67403+#define GR_BIND_MSG "denied bind() by "
67404+#define GR_CONNECT_MSG "denied connect() by "
67405+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
67406+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
67407+#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"
67408+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
67409+#define GR_CAP_ACL_MSG "use of %s denied for "
67410+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
67411+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
67412+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
67413+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
67414+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
67415+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
67416+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
67417+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
67418+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
67419+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
67420+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
67421+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
67422+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
67423+#define GR_VM86_MSG "denied use of vm86 by "
67424+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
67425+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
67426+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
67427+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
67428diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
67429new file mode 100644
67430index 0000000..bb1e366
67431--- /dev/null
67432+++ b/include/linux/grsecurity.h
67433@@ -0,0 +1,219 @@
67434+#ifndef GR_SECURITY_H
67435+#define GR_SECURITY_H
67436+#include <linux/fs.h>
67437+#include <linux/fs_struct.h>
67438+#include <linux/binfmts.h>
67439+#include <linux/gracl.h>
67440+#include <linux/compat.h>
67441+
67442+/* notify of brain-dead configs */
67443+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67444+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
67445+#endif
67446+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
67447+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
67448+#endif
67449+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
67450+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
67451+#endif
67452+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
67453+#error "CONFIG_PAX enabled, but no PaX options are enabled."
67454+#endif
67455+
67456+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
67457+void gr_handle_brute_check(void);
67458+void gr_handle_kernel_exploit(void);
67459+int gr_process_user_ban(void);
67460+
67461+char gr_roletype_to_char(void);
67462+
67463+int gr_acl_enable_at_secure(void);
67464+
67465+int gr_check_user_change(int real, int effective, int fs);
67466+int gr_check_group_change(int real, int effective, int fs);
67467+
67468+void gr_del_task_from_ip_table(struct task_struct *p);
67469+
67470+int gr_pid_is_chrooted(struct task_struct *p);
67471+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
67472+int gr_handle_chroot_nice(void);
67473+int gr_handle_chroot_sysctl(const int op);
67474+int gr_handle_chroot_setpriority(struct task_struct *p,
67475+ const int niceval);
67476+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
67477+int gr_handle_chroot_chroot(const struct dentry *dentry,
67478+ const struct vfsmount *mnt);
67479+void gr_handle_chroot_chdir(struct path *path);
67480+int gr_handle_chroot_chmod(const struct dentry *dentry,
67481+ const struct vfsmount *mnt, const int mode);
67482+int gr_handle_chroot_mknod(const struct dentry *dentry,
67483+ const struct vfsmount *mnt, const int mode);
67484+int gr_handle_chroot_mount(const struct dentry *dentry,
67485+ const struct vfsmount *mnt,
67486+ const char *dev_name);
67487+int gr_handle_chroot_pivot(void);
67488+int gr_handle_chroot_unix(const pid_t pid);
67489+
67490+int gr_handle_rawio(const struct inode *inode);
67491+
67492+void gr_handle_ioperm(void);
67493+void gr_handle_iopl(void);
67494+
67495+int gr_tpe_allow(const struct file *file);
67496+
67497+void gr_set_chroot_entries(struct task_struct *task, struct path *path);
67498+void gr_clear_chroot_entries(struct task_struct *task);
67499+
67500+void gr_log_forkfail(const int retval);
67501+void gr_log_timechange(void);
67502+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
67503+void gr_log_chdir(const struct dentry *dentry,
67504+ const struct vfsmount *mnt);
67505+void gr_log_chroot_exec(const struct dentry *dentry,
67506+ const struct vfsmount *mnt);
67507+void gr_handle_exec_args(struct linux_binprm *bprm, const char __user *const __user *argv);
67508+#ifdef CONFIG_COMPAT
67509+void gr_handle_exec_args_compat(struct linux_binprm *bprm, compat_uptr_t __user *argv);
67510+#endif
67511+void gr_log_remount(const char *devname, const int retval);
67512+void gr_log_unmount(const char *devname, const int retval);
67513+void gr_log_mount(const char *from, const char *to, const int retval);
67514+void gr_log_textrel(struct vm_area_struct *vma);
67515+void gr_log_rwxmmap(struct file *file);
67516+void gr_log_rwxmprotect(struct file *file);
67517+
67518+int gr_handle_follow_link(const struct inode *parent,
67519+ const struct inode *inode,
67520+ const struct dentry *dentry,
67521+ const struct vfsmount *mnt);
67522+int gr_handle_fifo(const struct dentry *dentry,
67523+ const struct vfsmount *mnt,
67524+ const struct dentry *dir, const int flag,
67525+ const int acc_mode);
67526+int gr_handle_hardlink(const struct dentry *dentry,
67527+ const struct vfsmount *mnt,
67528+ struct inode *inode,
67529+ const int mode, const char *to);
67530+
67531+int gr_is_capable(const int cap);
67532+int gr_is_capable_nolog(const int cap);
67533+void gr_learn_resource(const struct task_struct *task, const int limit,
67534+ const unsigned long wanted, const int gt);
67535+void gr_copy_label(struct task_struct *tsk);
67536+void gr_handle_crash(struct task_struct *task, const int sig);
67537+int gr_handle_signal(const struct task_struct *p, const int sig);
67538+int gr_check_crash_uid(const uid_t uid);
67539+int gr_check_protected_task(const struct task_struct *task);
67540+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
67541+int gr_acl_handle_mmap(const struct file *file,
67542+ const unsigned long prot);
67543+int gr_acl_handle_mprotect(const struct file *file,
67544+ const unsigned long prot);
67545+int gr_check_hidden_task(const struct task_struct *tsk);
67546+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
67547+ const struct vfsmount *mnt);
67548+__u32 gr_acl_handle_utime(const struct dentry *dentry,
67549+ const struct vfsmount *mnt);
67550+__u32 gr_acl_handle_access(const struct dentry *dentry,
67551+ const struct vfsmount *mnt, const int fmode);
67552+__u32 gr_acl_handle_fchmod(const struct dentry *dentry,
67553+ const struct vfsmount *mnt, mode_t mode);
67554+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
67555+ const struct vfsmount *mnt, mode_t mode);
67556+__u32 gr_acl_handle_chown(const struct dentry *dentry,
67557+ const struct vfsmount *mnt);
67558+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
67559+ const struct vfsmount *mnt);
67560+int gr_handle_ptrace(struct task_struct *task, const long request);
67561+int gr_handle_proc_ptrace(struct task_struct *task);
67562+__u32 gr_acl_handle_execve(const struct dentry *dentry,
67563+ const struct vfsmount *mnt);
67564+int gr_check_crash_exec(const struct file *filp);
67565+int gr_acl_is_enabled(void);
67566+void gr_set_kernel_label(struct task_struct *task);
67567+void gr_set_role_label(struct task_struct *task, const uid_t uid,
67568+ const gid_t gid);
67569+int gr_set_proc_label(const struct dentry *dentry,
67570+ const struct vfsmount *mnt,
67571+ const int unsafe_flags);
67572+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
67573+ const struct vfsmount *mnt);
67574+__u32 gr_acl_handle_open(const struct dentry *dentry,
67575+ const struct vfsmount *mnt, int acc_mode);
67576+__u32 gr_acl_handle_creat(const struct dentry *dentry,
67577+ const struct dentry *p_dentry,
67578+ const struct vfsmount *p_mnt,
67579+ int open_flags, int acc_mode, const int imode);
67580+void gr_handle_create(const struct dentry *dentry,
67581+ const struct vfsmount *mnt);
67582+void gr_handle_proc_create(const struct dentry *dentry,
67583+ const struct inode *inode);
67584+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
67585+ const struct dentry *parent_dentry,
67586+ const struct vfsmount *parent_mnt,
67587+ const int mode);
67588+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
67589+ const struct dentry *parent_dentry,
67590+ const struct vfsmount *parent_mnt);
67591+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
67592+ const struct vfsmount *mnt);
67593+void gr_handle_delete(const ino_t ino, const dev_t dev);
67594+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
67595+ const struct vfsmount *mnt);
67596+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
67597+ const struct dentry *parent_dentry,
67598+ const struct vfsmount *parent_mnt,
67599+ const char *from);
67600+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
67601+ const struct dentry *parent_dentry,
67602+ const struct vfsmount *parent_mnt,
67603+ const struct dentry *old_dentry,
67604+ const struct vfsmount *old_mnt, const char *to);
67605+int gr_acl_handle_rename(struct dentry *new_dentry,
67606+ struct dentry *parent_dentry,
67607+ const struct vfsmount *parent_mnt,
67608+ struct dentry *old_dentry,
67609+ struct inode *old_parent_inode,
67610+ struct vfsmount *old_mnt, const char *newname);
67611+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
67612+ struct dentry *old_dentry,
67613+ struct dentry *new_dentry,
67614+ struct vfsmount *mnt, const __u8 replace);
67615+__u32 gr_check_link(const struct dentry *new_dentry,
67616+ const struct dentry *parent_dentry,
67617+ const struct vfsmount *parent_mnt,
67618+ const struct dentry *old_dentry,
67619+ const struct vfsmount *old_mnt);
67620+int gr_acl_handle_filldir(const struct file *file, const char *name,
67621+ const unsigned int namelen, const ino_t ino);
67622+
67623+__u32 gr_acl_handle_unix(const struct dentry *dentry,
67624+ const struct vfsmount *mnt);
67625+void gr_acl_handle_exit(void);
67626+void gr_acl_handle_psacct(struct task_struct *task, const long code);
67627+int gr_acl_handle_procpidmem(const struct task_struct *task);
67628+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
67629+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
67630+void gr_audit_ptrace(struct task_struct *task);
67631+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
67632+
67633+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
67634+
67635+#ifdef CONFIG_GRKERNSEC
67636+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
67637+void gr_handle_vm86(void);
67638+void gr_handle_mem_readwrite(u64 from, u64 to);
67639+
67640+void gr_log_badprocpid(const char *entry);
67641+
67642+extern int grsec_enable_dmesg;
67643+extern int grsec_disable_privio;
67644+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
67645+extern int grsec_enable_chroot_findtask;
67646+#endif
67647+#ifdef CONFIG_GRKERNSEC_SETXID
67648+extern int grsec_enable_setxid;
67649+#endif
67650+#endif
67651+
67652+#endif
67653diff --git a/include/linux/hdpu_features.h b/include/linux/hdpu_features.h
67654index 6a87154..a3ce57b 100644
67655--- a/include/linux/hdpu_features.h
67656+++ b/include/linux/hdpu_features.h
67657@@ -3,7 +3,7 @@
67658 struct cpustate_t {
67659 spinlock_t lock;
67660 int excl;
67661- int open_count;
67662+ atomic_t open_count;
67663 unsigned char cached_val;
67664 int inited;
67665 unsigned long *set_addr;
67666diff --git a/include/linux/highmem.h b/include/linux/highmem.h
67667index 211ff44..00ab6d7 100644
67668--- a/include/linux/highmem.h
67669+++ b/include/linux/highmem.h
67670@@ -137,6 +137,18 @@ static inline void clear_highpage(struct page *page)
67671 kunmap_atomic(kaddr, KM_USER0);
67672 }
67673
67674+static inline void sanitize_highpage(struct page *page)
67675+{
67676+ void *kaddr;
67677+ unsigned long flags;
67678+
67679+ local_irq_save(flags);
67680+ kaddr = kmap_atomic(page, KM_CLEARPAGE);
67681+ clear_page(kaddr);
67682+ kunmap_atomic(kaddr, KM_CLEARPAGE);
67683+ local_irq_restore(flags);
67684+}
67685+
67686 static inline void zero_user_segments(struct page *page,
67687 unsigned start1, unsigned end1,
67688 unsigned start2, unsigned end2)
67689diff --git a/include/linux/i2c.h b/include/linux/i2c.h
67690index 7b40cda..24eb44e 100644
67691--- a/include/linux/i2c.h
67692+++ b/include/linux/i2c.h
67693@@ -325,6 +325,7 @@ struct i2c_algorithm {
67694 /* To determine what the adapter supports */
67695 u32 (*functionality) (struct i2c_adapter *);
67696 };
67697+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
67698
67699 /*
67700 * i2c_adapter is the structure used to identify a physical i2c bus along
67701diff --git a/include/linux/i2o.h b/include/linux/i2o.h
67702index 4c4e57d..f3c5303 100644
67703--- a/include/linux/i2o.h
67704+++ b/include/linux/i2o.h
67705@@ -564,7 +564,7 @@ struct i2o_controller {
67706 struct i2o_device *exec; /* Executive */
67707 #if BITS_PER_LONG == 64
67708 spinlock_t context_list_lock; /* lock for context_list */
67709- atomic_t context_list_counter; /* needed for unique contexts */
67710+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
67711 struct list_head context_list; /* list of context id's
67712 and pointers */
67713 #endif
67714diff --git a/include/linux/init_task.h b/include/linux/init_task.h
67715index 21a6f5d..dc42eab 100644
67716--- a/include/linux/init_task.h
67717+++ b/include/linux/init_task.h
67718@@ -83,6 +83,12 @@ extern struct group_info init_groups;
67719 #define INIT_IDS
67720 #endif
67721
67722+#ifdef CONFIG_X86
67723+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
67724+#else
67725+#define INIT_TASK_THREAD_INFO
67726+#endif
67727+
67728 #ifdef CONFIG_SECURITY_FILE_CAPABILITIES
67729 /*
67730 * Because of the reduced scope of CAP_SETPCAP when filesystem
67731@@ -156,6 +162,7 @@ extern struct cred init_cred;
67732 __MUTEX_INITIALIZER(tsk.cred_guard_mutex), \
67733 .comm = "swapper", \
67734 .thread = INIT_THREAD, \
67735+ INIT_TASK_THREAD_INFO \
67736 .fs = &init_fs, \
67737 .files = &init_files, \
67738 .signal = &init_signals, \
67739diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
67740index 4f0a72a..a849599 100644
67741--- a/include/linux/intel-iommu.h
67742+++ b/include/linux/intel-iommu.h
67743@@ -296,7 +296,7 @@ struct iommu_flush {
67744 u8 fm, u64 type);
67745 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
67746 unsigned int size_order, u64 type);
67747-};
67748+} __no_const;
67749
67750 enum {
67751 SR_DMAR_FECTL_REG,
67752diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
67753index c739150..be577b5 100644
67754--- a/include/linux/interrupt.h
67755+++ b/include/linux/interrupt.h
67756@@ -369,7 +369,7 @@ enum
67757 /* map softirq index to softirq name. update 'softirq_to_name' in
67758 * kernel/softirq.c when adding a new softirq.
67759 */
67760-extern char *softirq_to_name[NR_SOFTIRQS];
67761+extern const char * const softirq_to_name[NR_SOFTIRQS];
67762
67763 /* softirq mask and active fields moved to irq_cpustat_t in
67764 * asm/hardirq.h to get better cache usage. KAO
67765@@ -377,12 +377,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
67766
67767 struct softirq_action
67768 {
67769- void (*action)(struct softirq_action *);
67770+ void (*action)(void);
67771 };
67772
67773 asmlinkage void do_softirq(void);
67774 asmlinkage void __do_softirq(void);
67775-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
67776+extern void open_softirq(int nr, void (*action)(void));
67777 extern void softirq_init(void);
67778 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
67779 extern void raise_softirq_irqoff(unsigned int nr);
67780diff --git a/include/linux/irq.h b/include/linux/irq.h
67781index 9e5f45a..025865b 100644
67782--- a/include/linux/irq.h
67783+++ b/include/linux/irq.h
67784@@ -438,12 +438,12 @@ extern int set_irq_msi(unsigned int irq, struct msi_desc *entry);
67785 static inline bool alloc_desc_masks(struct irq_desc *desc, int node,
67786 bool boot)
67787 {
67788+#ifdef CONFIG_CPUMASK_OFFSTACK
67789 gfp_t gfp = GFP_ATOMIC;
67790
67791 if (boot)
67792 gfp = GFP_NOWAIT;
67793
67794-#ifdef CONFIG_CPUMASK_OFFSTACK
67795 if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))
67796 return false;
67797
67798diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
67799index 7922742..27306a2 100644
67800--- a/include/linux/kallsyms.h
67801+++ b/include/linux/kallsyms.h
67802@@ -15,7 +15,8 @@
67803
67804 struct module;
67805
67806-#ifdef CONFIG_KALLSYMS
67807+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
67808+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67809 /* Lookup the address for a symbol. Returns 0 if not found. */
67810 unsigned long kallsyms_lookup_name(const char *name);
67811
67812@@ -92,6 +93,15 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
67813 /* Stupid that this does nothing, but I didn't create this mess. */
67814 #define __print_symbol(fmt, addr)
67815 #endif /*CONFIG_KALLSYMS*/
67816+#else /* when included by kallsyms.c, vsnprintf.c, or
67817+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
67818+extern void __print_symbol(const char *fmt, unsigned long address);
67819+extern int sprint_symbol(char *buffer, unsigned long address);
67820+const char *kallsyms_lookup(unsigned long addr,
67821+ unsigned long *symbolsize,
67822+ unsigned long *offset,
67823+ char **modname, char *namebuf);
67824+#endif
67825
67826 /* This macro allows us to keep printk typechecking */
67827 static void __check_printsym_format(const char *fmt, ...)
67828diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
67829index 6adcc29..13369e8 100644
67830--- a/include/linux/kgdb.h
67831+++ b/include/linux/kgdb.h
67832@@ -74,8 +74,8 @@ void kgdb_breakpoint(void);
67833
67834 extern int kgdb_connected;
67835
67836-extern atomic_t kgdb_setting_breakpoint;
67837-extern atomic_t kgdb_cpu_doing_single_step;
67838+extern atomic_unchecked_t kgdb_setting_breakpoint;
67839+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
67840
67841 extern struct task_struct *kgdb_usethread;
67842 extern struct task_struct *kgdb_contthread;
67843@@ -235,7 +235,7 @@ struct kgdb_arch {
67844 int (*remove_hw_breakpoint)(unsigned long, int, enum kgdb_bptype);
67845 void (*remove_all_hw_break)(void);
67846 void (*correct_hw_break)(void);
67847-};
67848+} __do_const;
67849
67850 /**
67851 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
67852@@ -257,14 +257,14 @@ struct kgdb_io {
67853 int (*init) (void);
67854 void (*pre_exception) (void);
67855 void (*post_exception) (void);
67856-};
67857+} __do_const;
67858
67859-extern struct kgdb_arch arch_kgdb_ops;
67860+extern const struct kgdb_arch arch_kgdb_ops;
67861
67862 extern unsigned long __weak kgdb_arch_pc(int exception, struct pt_regs *regs);
67863
67864-extern int kgdb_register_io_module(struct kgdb_io *local_kgdb_io_ops);
67865-extern void kgdb_unregister_io_module(struct kgdb_io *local_kgdb_io_ops);
67866+extern int kgdb_register_io_module(const struct kgdb_io *local_kgdb_io_ops);
67867+extern void kgdb_unregister_io_module(const struct kgdb_io *local_kgdb_io_ops);
67868
67869 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
67870 extern int kgdb_mem2hex(char *mem, char *buf, int count);
67871diff --git a/include/linux/kmod.h b/include/linux/kmod.h
67872index 384ca8b..83dd97d 100644
67873--- a/include/linux/kmod.h
67874+++ b/include/linux/kmod.h
67875@@ -31,6 +31,8 @@
67876 * usually useless though. */
67877 extern int __request_module(bool wait, const char *name, ...) \
67878 __attribute__((format(printf, 2, 3)));
67879+extern int ___request_module(bool wait, char *param_name, const char *name, ...) \
67880+ __attribute__((format(printf, 3, 4)));
67881 #define request_module(mod...) __request_module(true, mod)
67882 #define request_module_nowait(mod...) __request_module(false, mod)
67883 #define try_then_request_module(x, mod...) \
67884diff --git a/include/linux/kobject.h b/include/linux/kobject.h
67885index 58ae8e0..3950d3c 100644
67886--- a/include/linux/kobject.h
67887+++ b/include/linux/kobject.h
67888@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kobject *kobj, gfp_t flag);
67889
67890 struct kobj_type {
67891 void (*release)(struct kobject *kobj);
67892- struct sysfs_ops *sysfs_ops;
67893+ const struct sysfs_ops *sysfs_ops;
67894 struct attribute **default_attrs;
67895 };
67896
67897@@ -118,9 +118,9 @@ struct kobj_uevent_env {
67898 };
67899
67900 struct kset_uevent_ops {
67901- int (*filter)(struct kset *kset, struct kobject *kobj);
67902- const char *(*name)(struct kset *kset, struct kobject *kobj);
67903- int (*uevent)(struct kset *kset, struct kobject *kobj,
67904+ int (* const filter)(struct kset *kset, struct kobject *kobj);
67905+ const char *(* const name)(struct kset *kset, struct kobject *kobj);
67906+ int (* const uevent)(struct kset *kset, struct kobject *kobj,
67907 struct kobj_uevent_env *env);
67908 };
67909
67910@@ -132,7 +132,7 @@ struct kobj_attribute {
67911 const char *buf, size_t count);
67912 };
67913
67914-extern struct sysfs_ops kobj_sysfs_ops;
67915+extern const struct sysfs_ops kobj_sysfs_ops;
67916
67917 /**
67918 * struct kset - a set of kobjects of a specific type, belonging to a specific subsystem.
67919@@ -155,14 +155,14 @@ struct kset {
67920 struct list_head list;
67921 spinlock_t list_lock;
67922 struct kobject kobj;
67923- struct kset_uevent_ops *uevent_ops;
67924+ const struct kset_uevent_ops *uevent_ops;
67925 };
67926
67927 extern void kset_init(struct kset *kset);
67928 extern int __must_check kset_register(struct kset *kset);
67929 extern void kset_unregister(struct kset *kset);
67930 extern struct kset * __must_check kset_create_and_add(const char *name,
67931- struct kset_uevent_ops *u,
67932+ const struct kset_uevent_ops *u,
67933 struct kobject *parent_kobj);
67934
67935 static inline struct kset *to_kset(struct kobject *kobj)
67936diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
67937index c728a50..752d821 100644
67938--- a/include/linux/kvm_host.h
67939+++ b/include/linux/kvm_host.h
67940@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
67941 void vcpu_load(struct kvm_vcpu *vcpu);
67942 void vcpu_put(struct kvm_vcpu *vcpu);
67943
67944-int kvm_init(void *opaque, unsigned int vcpu_size,
67945+int kvm_init(const void *opaque, unsigned int vcpu_size,
67946 struct module *module);
67947 void kvm_exit(void);
67948
67949@@ -316,7 +316,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
67950 struct kvm_guest_debug *dbg);
67951 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
67952
67953-int kvm_arch_init(void *opaque);
67954+int kvm_arch_init(const void *opaque);
67955 void kvm_arch_exit(void);
67956
67957 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
67958diff --git a/include/linux/libata.h b/include/linux/libata.h
67959index a069916..223edde 100644
67960--- a/include/linux/libata.h
67961+++ b/include/linux/libata.h
67962@@ -525,11 +525,11 @@ struct ata_ioports {
67963
67964 struct ata_host {
67965 spinlock_t lock;
67966- struct device *dev;
67967+ struct device *dev;
67968 void __iomem * const *iomap;
67969 unsigned int n_ports;
67970 void *private_data;
67971- struct ata_port_operations *ops;
67972+ const struct ata_port_operations *ops;
67973 unsigned long flags;
67974 #ifdef CONFIG_ATA_ACPI
67975 acpi_handle acpi_handle;
67976@@ -710,7 +710,7 @@ struct ata_link {
67977
67978 struct ata_port {
67979 struct Scsi_Host *scsi_host; /* our co-allocated scsi host */
67980- struct ata_port_operations *ops;
67981+ const struct ata_port_operations *ops;
67982 spinlock_t *lock;
67983 /* Flags owned by the EH context. Only EH should touch these once the
67984 port is active */
67985@@ -884,7 +884,7 @@ struct ata_port_operations {
67986 * fields must be pointers.
67987 */
67988 const struct ata_port_operations *inherits;
67989-};
67990+} __do_const;
67991
67992 struct ata_port_info {
67993 unsigned long flags;
67994@@ -892,7 +892,7 @@ struct ata_port_info {
67995 unsigned long pio_mask;
67996 unsigned long mwdma_mask;
67997 unsigned long udma_mask;
67998- struct ata_port_operations *port_ops;
67999+ const struct ata_port_operations *port_ops;
68000 void *private_data;
68001 };
68002
68003@@ -916,7 +916,7 @@ extern const unsigned long sata_deb_timing_normal[];
68004 extern const unsigned long sata_deb_timing_hotplug[];
68005 extern const unsigned long sata_deb_timing_long[];
68006
68007-extern struct ata_port_operations ata_dummy_port_ops;
68008+extern const struct ata_port_operations ata_dummy_port_ops;
68009 extern const struct ata_port_info ata_dummy_port_info;
68010
68011 static inline const unsigned long *
68012@@ -962,7 +962,7 @@ extern int ata_host_activate(struct ata_host *host, int irq,
68013 struct scsi_host_template *sht);
68014 extern void ata_host_detach(struct ata_host *host);
68015 extern void ata_host_init(struct ata_host *, struct device *,
68016- unsigned long, struct ata_port_operations *);
68017+ unsigned long, const struct ata_port_operations *);
68018 extern int ata_scsi_detect(struct scsi_host_template *sht);
68019 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
68020 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
68021diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
68022index fbc48f8..0886e57 100644
68023--- a/include/linux/lockd/bind.h
68024+++ b/include/linux/lockd/bind.h
68025@@ -23,13 +23,13 @@ struct svc_rqst;
68026 * This is the set of functions for lockd->nfsd communication
68027 */
68028 struct nlmsvc_binding {
68029- __be32 (*fopen)(struct svc_rqst *,
68030+ __be32 (* const fopen)(struct svc_rqst *,
68031 struct nfs_fh *,
68032 struct file **);
68033- void (*fclose)(struct file *);
68034+ void (* const fclose)(struct file *);
68035 };
68036
68037-extern struct nlmsvc_binding * nlmsvc_ops;
68038+extern const struct nlmsvc_binding * nlmsvc_ops;
68039
68040 /*
68041 * Similar to nfs_client_initdata, but without the NFS-specific
68042diff --git a/include/linux/mca.h b/include/linux/mca.h
68043index 3797270..7765ede 100644
68044--- a/include/linux/mca.h
68045+++ b/include/linux/mca.h
68046@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
68047 int region);
68048 void * (*mca_transform_memory)(struct mca_device *,
68049 void *memory);
68050-};
68051+} __no_const;
68052
68053 struct mca_bus {
68054 u64 default_dma_mask;
68055diff --git a/include/linux/memory.h b/include/linux/memory.h
68056index 37fa19b..b597c85 100644
68057--- a/include/linux/memory.h
68058+++ b/include/linux/memory.h
68059@@ -108,7 +108,7 @@ struct memory_accessor {
68060 size_t count);
68061 ssize_t (*write)(struct memory_accessor *, const char *buf,
68062 off_t offset, size_t count);
68063-};
68064+} __no_const;
68065
68066 /*
68067 * Kernel text modification mutex, used for code patching. Users of this lock
68068diff --git a/include/linux/mm.h b/include/linux/mm.h
68069index 11e5be6..1ff2423 100644
68070--- a/include/linux/mm.h
68071+++ b/include/linux/mm.h
68072@@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void *objp);
68073
68074 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
68075 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
68076+
68077+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
68078+#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
68079+#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
68080+#else
68081 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
68082+#endif
68083+
68084 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
68085 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
68086
68087@@ -841,12 +848,6 @@ int set_page_dirty(struct page *page);
68088 int set_page_dirty_lock(struct page *page);
68089 int clear_page_dirty_for_io(struct page *page);
68090
68091-/* Is the vma a continuation of the stack vma above it? */
68092-static inline int vma_stack_continue(struct vm_area_struct *vma, unsigned long addr)
68093-{
68094- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
68095-}
68096-
68097 extern unsigned long move_page_tables(struct vm_area_struct *vma,
68098 unsigned long old_addr, struct vm_area_struct *new_vma,
68099 unsigned long new_addr, unsigned long len);
68100@@ -890,6 +891,8 @@ struct shrinker {
68101 extern void register_shrinker(struct shrinker *);
68102 extern void unregister_shrinker(struct shrinker *);
68103
68104+pgprot_t vm_get_page_prot(unsigned long vm_flags);
68105+
68106 int vma_wants_writenotify(struct vm_area_struct *vma);
68107
68108 extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl);
68109@@ -1162,6 +1165,7 @@ out:
68110 }
68111
68112 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
68113+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
68114
68115 extern unsigned long do_brk(unsigned long, unsigned long);
68116
68117@@ -1218,6 +1222,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
68118 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
68119 struct vm_area_struct **pprev);
68120
68121+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
68122+extern void pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
68123+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
68124+
68125 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
68126 NULL if none. Assume start_addr < end_addr. */
68127 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
68128@@ -1234,7 +1242,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
68129 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
68130 }
68131
68132-pgprot_t vm_get_page_prot(unsigned long vm_flags);
68133 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
68134 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
68135 unsigned long pfn, unsigned long size, pgprot_t);
68136@@ -1332,7 +1339,13 @@ extern void memory_failure(unsigned long pfn, int trapno);
68137 extern int __memory_failure(unsigned long pfn, int trapno, int ref);
68138 extern int sysctl_memory_failure_early_kill;
68139 extern int sysctl_memory_failure_recovery;
68140-extern atomic_long_t mce_bad_pages;
68141+extern atomic_long_unchecked_t mce_bad_pages;
68142+
68143+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
68144+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
68145+#else
68146+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
68147+#endif
68148
68149 #endif /* __KERNEL__ */
68150 #endif /* _LINUX_MM_H */
68151diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
68152index 9d12ed5..6d9707a 100644
68153--- a/include/linux/mm_types.h
68154+++ b/include/linux/mm_types.h
68155@@ -186,6 +186,8 @@ struct vm_area_struct {
68156 #ifdef CONFIG_NUMA
68157 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
68158 #endif
68159+
68160+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
68161 };
68162
68163 struct core_thread {
68164@@ -287,6 +289,24 @@ struct mm_struct {
68165 #ifdef CONFIG_MMU_NOTIFIER
68166 struct mmu_notifier_mm *mmu_notifier_mm;
68167 #endif
68168+
68169+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
68170+ unsigned long pax_flags;
68171+#endif
68172+
68173+#ifdef CONFIG_PAX_DLRESOLVE
68174+ unsigned long call_dl_resolve;
68175+#endif
68176+
68177+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
68178+ unsigned long call_syscall;
68179+#endif
68180+
68181+#ifdef CONFIG_PAX_ASLR
68182+ unsigned long delta_mmap; /* randomized offset */
68183+ unsigned long delta_stack; /* randomized offset */
68184+#endif
68185+
68186 };
68187
68188 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
68189diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
68190index 4e02ee2..afb159e 100644
68191--- a/include/linux/mmu_notifier.h
68192+++ b/include/linux/mmu_notifier.h
68193@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
68194 */
68195 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
68196 ({ \
68197- pte_t __pte; \
68198+ pte_t ___pte; \
68199 struct vm_area_struct *___vma = __vma; \
68200 unsigned long ___address = __address; \
68201- __pte = ptep_clear_flush(___vma, ___address, __ptep); \
68202+ ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
68203 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
68204- __pte; \
68205+ ___pte; \
68206 })
68207
68208 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
68209diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
68210index 6c31a2a..4b0e930 100644
68211--- a/include/linux/mmzone.h
68212+++ b/include/linux/mmzone.h
68213@@ -350,7 +350,7 @@ struct zone {
68214 unsigned long flags; /* zone flags, see below */
68215
68216 /* Zone statistics */
68217- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
68218+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
68219
68220 /*
68221 * prev_priority holds the scanning priority for this zone. It is
68222diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
68223index f58e9d8..3503935 100644
68224--- a/include/linux/mod_devicetable.h
68225+++ b/include/linux/mod_devicetable.h
68226@@ -12,7 +12,7 @@
68227 typedef unsigned long kernel_ulong_t;
68228 #endif
68229
68230-#define PCI_ANY_ID (~0)
68231+#define PCI_ANY_ID ((__u16)~0)
68232
68233 struct pci_device_id {
68234 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
68235@@ -131,7 +131,7 @@ struct usb_device_id {
68236 #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
68237 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
68238
68239-#define HID_ANY_ID (~0)
68240+#define HID_ANY_ID (~0U)
68241
68242 struct hid_device_id {
68243 __u16 bus;
68244diff --git a/include/linux/module.h b/include/linux/module.h
68245index 482efc8..642032b 100644
68246--- a/include/linux/module.h
68247+++ b/include/linux/module.h
68248@@ -16,6 +16,7 @@
68249 #include <linux/kobject.h>
68250 #include <linux/moduleparam.h>
68251 #include <linux/tracepoint.h>
68252+#include <linux/fs.h>
68253
68254 #include <asm/local.h>
68255 #include <asm/module.h>
68256@@ -287,16 +288,16 @@ struct module
68257 int (*init)(void);
68258
68259 /* If this is non-NULL, vfree after init() returns */
68260- void *module_init;
68261+ void *module_init_rx, *module_init_rw;
68262
68263 /* Here is the actual code + data, vfree'd on unload. */
68264- void *module_core;
68265+ void *module_core_rx, *module_core_rw;
68266
68267 /* Here are the sizes of the init and core sections */
68268- unsigned int init_size, core_size;
68269+ unsigned int init_size_rw, core_size_rw;
68270
68271 /* The size of the executable code in each section. */
68272- unsigned int init_text_size, core_text_size;
68273+ unsigned int init_size_rx, core_size_rx;
68274
68275 /* Arch-specific module values */
68276 struct mod_arch_specific arch;
68277@@ -345,6 +346,10 @@ struct module
68278 #ifdef CONFIG_EVENT_TRACING
68279 struct ftrace_event_call *trace_events;
68280 unsigned int num_trace_events;
68281+ struct file_operations trace_id;
68282+ struct file_operations trace_enable;
68283+ struct file_operations trace_format;
68284+ struct file_operations trace_filter;
68285 #endif
68286 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
68287 unsigned long *ftrace_callsites;
68288@@ -393,16 +398,46 @@ struct module *__module_address(unsigned long addr);
68289 bool is_module_address(unsigned long addr);
68290 bool is_module_text_address(unsigned long addr);
68291
68292+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
68293+{
68294+
68295+#ifdef CONFIG_PAX_KERNEXEC
68296+ if (ktla_ktva(addr) >= (unsigned long)start &&
68297+ ktla_ktva(addr) < (unsigned long)start + size)
68298+ return 1;
68299+#endif
68300+
68301+ return ((void *)addr >= start && (void *)addr < start + size);
68302+}
68303+
68304+static inline int within_module_core_rx(unsigned long addr, struct module *mod)
68305+{
68306+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
68307+}
68308+
68309+static inline int within_module_core_rw(unsigned long addr, struct module *mod)
68310+{
68311+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
68312+}
68313+
68314+static inline int within_module_init_rx(unsigned long addr, struct module *mod)
68315+{
68316+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
68317+}
68318+
68319+static inline int within_module_init_rw(unsigned long addr, struct module *mod)
68320+{
68321+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
68322+}
68323+
68324 static inline int within_module_core(unsigned long addr, struct module *mod)
68325 {
68326- return (unsigned long)mod->module_core <= addr &&
68327- addr < (unsigned long)mod->module_core + mod->core_size;
68328+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
68329 }
68330
68331 static inline int within_module_init(unsigned long addr, struct module *mod)
68332 {
68333- return (unsigned long)mod->module_init <= addr &&
68334- addr < (unsigned long)mod->module_init + mod->init_size;
68335+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
68336 }
68337
68338 /* Search for module by name: must hold module_mutex. */
68339diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
68340index c1f40c2..682ca53 100644
68341--- a/include/linux/moduleloader.h
68342+++ b/include/linux/moduleloader.h
68343@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
68344 sections. Returns NULL on failure. */
68345 void *module_alloc(unsigned long size);
68346
68347+#ifdef CONFIG_PAX_KERNEXEC
68348+void *module_alloc_exec(unsigned long size);
68349+#else
68350+#define module_alloc_exec(x) module_alloc(x)
68351+#endif
68352+
68353 /* Free memory returned from module_alloc. */
68354 void module_free(struct module *mod, void *module_region);
68355
68356+#ifdef CONFIG_PAX_KERNEXEC
68357+void module_free_exec(struct module *mod, void *module_region);
68358+#else
68359+#define module_free_exec(x, y) module_free((x), (y))
68360+#endif
68361+
68362 /* Apply the given relocation to the (simplified) ELF. Return -error
68363 or 0. */
68364 int apply_relocate(Elf_Shdr *sechdrs,
68365diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
68366index 82a9124..8a5f622 100644
68367--- a/include/linux/moduleparam.h
68368+++ b/include/linux/moduleparam.h
68369@@ -132,7 +132,7 @@ struct kparam_array
68370
68371 /* Actually copy string: maxlen param is usually sizeof(string). */
68372 #define module_param_string(name, string, len, perm) \
68373- static const struct kparam_string __param_string_##name \
68374+ static const struct kparam_string __param_string_##name __used \
68375 = { len, string }; \
68376 __module_param_call(MODULE_PARAM_PREFIX, name, \
68377 param_set_copystring, param_get_string, \
68378@@ -211,7 +211,7 @@ extern int param_get_invbool(char *buffer, struct kernel_param *kp);
68379
68380 /* Comma-separated array: *nump is set to number they actually specified. */
68381 #define module_param_array_named(name, array, type, nump, perm) \
68382- static const struct kparam_array __param_arr_##name \
68383+ static const struct kparam_array __param_arr_##name __used \
68384 = { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\
68385 sizeof(array[0]), array }; \
68386 __module_param_call(MODULE_PARAM_PREFIX, name, \
68387diff --git a/include/linux/mutex.h b/include/linux/mutex.h
68388index 878cab4..c92cb3e 100644
68389--- a/include/linux/mutex.h
68390+++ b/include/linux/mutex.h
68391@@ -51,7 +51,7 @@ struct mutex {
68392 spinlock_t wait_lock;
68393 struct list_head wait_list;
68394 #if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP)
68395- struct thread_info *owner;
68396+ struct task_struct *owner;
68397 #endif
68398 #ifdef CONFIG_DEBUG_MUTEXES
68399 const char *name;
68400diff --git a/include/linux/namei.h b/include/linux/namei.h
68401index ec0f607..d19e675 100644
68402--- a/include/linux/namei.h
68403+++ b/include/linux/namei.h
68404@@ -22,7 +22,7 @@ struct nameidata {
68405 unsigned int flags;
68406 int last_type;
68407 unsigned depth;
68408- char *saved_names[MAX_NESTED_LINKS + 1];
68409+ const char *saved_names[MAX_NESTED_LINKS + 1];
68410
68411 /* Intent data */
68412 union {
68413@@ -84,12 +84,12 @@ extern int follow_up(struct path *);
68414 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
68415 extern void unlock_rename(struct dentry *, struct dentry *);
68416
68417-static inline void nd_set_link(struct nameidata *nd, char *path)
68418+static inline void nd_set_link(struct nameidata *nd, const char *path)
68419 {
68420 nd->saved_names[nd->depth] = path;
68421 }
68422
68423-static inline char *nd_get_link(struct nameidata *nd)
68424+static inline const char *nd_get_link(const struct nameidata *nd)
68425 {
68426 return nd->saved_names[nd->depth];
68427 }
68428diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
68429index 9d7e8f7..04428c5 100644
68430--- a/include/linux/netdevice.h
68431+++ b/include/linux/netdevice.h
68432@@ -637,6 +637,7 @@ struct net_device_ops {
68433 u16 xid);
68434 #endif
68435 };
68436+typedef struct net_device_ops __no_const net_device_ops_no_const;
68437
68438 /*
68439 * The DEVICE structure.
68440diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
68441new file mode 100644
68442index 0000000..33f4af8
68443--- /dev/null
68444+++ b/include/linux/netfilter/xt_gradm.h
68445@@ -0,0 +1,9 @@
68446+#ifndef _LINUX_NETFILTER_XT_GRADM_H
68447+#define _LINUX_NETFILTER_XT_GRADM_H 1
68448+
68449+struct xt_gradm_mtinfo {
68450+ __u16 flags;
68451+ __u16 invflags;
68452+};
68453+
68454+#endif
68455diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
68456index b359c4a..c08b334 100644
68457--- a/include/linux/nodemask.h
68458+++ b/include/linux/nodemask.h
68459@@ -464,11 +464,11 @@ static inline int num_node_state(enum node_states state)
68460
68461 #define any_online_node(mask) \
68462 ({ \
68463- int node; \
68464- for_each_node_mask(node, (mask)) \
68465- if (node_online(node)) \
68466+ int __node; \
68467+ for_each_node_mask(__node, (mask)) \
68468+ if (node_online(__node)) \
68469 break; \
68470- node; \
68471+ __node; \
68472 })
68473
68474 #define num_online_nodes() num_node_state(N_ONLINE)
68475diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
68476index 5171639..7cf4235 100644
68477--- a/include/linux/oprofile.h
68478+++ b/include/linux/oprofile.h
68479@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
68480 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
68481 char const * name, ulong * val);
68482
68483-/** Create a file for read-only access to an atomic_t. */
68484+/** Create a file for read-only access to an atomic_unchecked_t. */
68485 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
68486- char const * name, atomic_t * val);
68487+ char const * name, atomic_unchecked_t * val);
68488
68489 /** create a directory */
68490 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
68491diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
68492index 3c62ed4..8924c7c 100644
68493--- a/include/linux/pagemap.h
68494+++ b/include/linux/pagemap.h
68495@@ -425,7 +425,9 @@ static inline int fault_in_pages_readable(const char __user *uaddr, int size)
68496 if (((unsigned long)uaddr & PAGE_MASK) !=
68497 ((unsigned long)end & PAGE_MASK))
68498 ret = __get_user(c, end);
68499+ (void)c;
68500 }
68501+ (void)c;
68502 return ret;
68503 }
68504
68505diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
68506index 81c9689..a567a55 100644
68507--- a/include/linux/perf_event.h
68508+++ b/include/linux/perf_event.h
68509@@ -476,7 +476,7 @@ struct hw_perf_event {
68510 struct hrtimer hrtimer;
68511 };
68512 };
68513- atomic64_t prev_count;
68514+ atomic64_unchecked_t prev_count;
68515 u64 sample_period;
68516 u64 last_period;
68517 atomic64_t period_left;
68518@@ -557,7 +557,7 @@ struct perf_event {
68519 const struct pmu *pmu;
68520
68521 enum perf_event_active_state state;
68522- atomic64_t count;
68523+ atomic64_unchecked_t count;
68524
68525 /*
68526 * These are the total time in nanoseconds that the event
68527@@ -595,8 +595,8 @@ struct perf_event {
68528 * These accumulate total time (in nanoseconds) that children
68529 * events have been enabled and running, respectively.
68530 */
68531- atomic64_t child_total_time_enabled;
68532- atomic64_t child_total_time_running;
68533+ atomic64_unchecked_t child_total_time_enabled;
68534+ atomic64_unchecked_t child_total_time_running;
68535
68536 /*
68537 * Protect attach/detach and child_list:
68538diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
68539index b43a9e0..b77d869 100644
68540--- a/include/linux/pipe_fs_i.h
68541+++ b/include/linux/pipe_fs_i.h
68542@@ -46,9 +46,9 @@ struct pipe_inode_info {
68543 wait_queue_head_t wait;
68544 unsigned int nrbufs, curbuf;
68545 struct page *tmp_page;
68546- unsigned int readers;
68547- unsigned int writers;
68548- unsigned int waiting_writers;
68549+ atomic_t readers;
68550+ atomic_t writers;
68551+ atomic_t waiting_writers;
68552 unsigned int r_counter;
68553 unsigned int w_counter;
68554 struct fasync_struct *fasync_readers;
68555diff --git a/include/linux/poison.h b/include/linux/poison.h
68556index 34066ff..e95d744 100644
68557--- a/include/linux/poison.h
68558+++ b/include/linux/poison.h
68559@@ -19,8 +19,8 @@
68560 * under normal circumstances, used to verify that nobody uses
68561 * non-initialized list entries.
68562 */
68563-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
68564-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
68565+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
68566+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
68567
68568 /********** include/linux/timer.h **********/
68569 /*
68570diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
68571index 4f71bf4..77ffa64 100644
68572--- a/include/linux/posix-timers.h
68573+++ b/include/linux/posix-timers.h
68574@@ -67,7 +67,7 @@ struct k_itimer {
68575 };
68576
68577 struct k_clock {
68578- int res; /* in nanoseconds */
68579+ const int res; /* in nanoseconds */
68580 int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
68581 int (*clock_set) (const clockid_t which_clock, struct timespec * tp);
68582 int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
68583diff --git a/include/linux/preempt.h b/include/linux/preempt.h
68584index 72b1a10..13303a9 100644
68585--- a/include/linux/preempt.h
68586+++ b/include/linux/preempt.h
68587@@ -110,7 +110,7 @@ struct preempt_ops {
68588 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
68589 void (*sched_out)(struct preempt_notifier *notifier,
68590 struct task_struct *next);
68591-};
68592+} __no_const;
68593
68594 /**
68595 * preempt_notifier - key for installing preemption notifiers
68596diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
68597index 379eaed..1bf73e3 100644
68598--- a/include/linux/proc_fs.h
68599+++ b/include/linux/proc_fs.h
68600@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode,
68601 return proc_create_data(name, mode, parent, proc_fops, NULL);
68602 }
68603
68604+static inline struct proc_dir_entry *proc_create_grsec(const char *name, mode_t mode,
68605+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
68606+{
68607+#ifdef CONFIG_GRKERNSEC_PROC_USER
68608+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
68609+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
68610+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
68611+#else
68612+ return proc_create_data(name, mode, parent, proc_fops, NULL);
68613+#endif
68614+}
68615+
68616+
68617 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
68618 mode_t mode, struct proc_dir_entry *base,
68619 read_proc_t *read_proc, void * data)
68620@@ -256,7 +269,7 @@ union proc_op {
68621 int (*proc_show)(struct seq_file *m,
68622 struct pid_namespace *ns, struct pid *pid,
68623 struct task_struct *task);
68624-};
68625+} __no_const;
68626
68627 struct ctl_table_header;
68628 struct ctl_table;
68629diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
68630index 7456d7d..6c1cfc9 100644
68631--- a/include/linux/ptrace.h
68632+++ b/include/linux/ptrace.h
68633@@ -96,10 +96,10 @@ extern void __ptrace_unlink(struct task_struct *child);
68634 extern void exit_ptrace(struct task_struct *tracer);
68635 #define PTRACE_MODE_READ 1
68636 #define PTRACE_MODE_ATTACH 2
68637-/* Returns 0 on success, -errno on denial. */
68638-extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
68639 /* Returns true on success, false on denial. */
68640 extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
68641+/* Returns true on success, false on denial. */
68642+extern bool ptrace_may_access_log(struct task_struct *task, unsigned int mode);
68643
68644 static inline int ptrace_reparented(struct task_struct *child)
68645 {
68646diff --git a/include/linux/random.h b/include/linux/random.h
68647index 2948046..3262567 100644
68648--- a/include/linux/random.h
68649+++ b/include/linux/random.h
68650@@ -63,6 +63,11 @@ unsigned long randomize_range(unsigned long start, unsigned long end, unsigned l
68651 u32 random32(void);
68652 void srandom32(u32 seed);
68653
68654+static inline unsigned long pax_get_random_long(void)
68655+{
68656+ return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
68657+}
68658+
68659 #endif /* __KERNEL___ */
68660
68661 #endif /* _LINUX_RANDOM_H */
68662diff --git a/include/linux/reboot.h b/include/linux/reboot.h
68663index 988e55f..17cb4ef 100644
68664--- a/include/linux/reboot.h
68665+++ b/include/linux/reboot.h
68666@@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
68667 * Architecture-specific implementations of sys_reboot commands.
68668 */
68669
68670-extern void machine_restart(char *cmd);
68671-extern void machine_halt(void);
68672-extern void machine_power_off(void);
68673+extern void machine_restart(char *cmd) __noreturn;
68674+extern void machine_halt(void) __noreturn;
68675+extern void machine_power_off(void) __noreturn;
68676
68677 extern void machine_shutdown(void);
68678 struct pt_regs;
68679@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
68680 */
68681
68682 extern void kernel_restart_prepare(char *cmd);
68683-extern void kernel_restart(char *cmd);
68684-extern void kernel_halt(void);
68685-extern void kernel_power_off(void);
68686+extern void kernel_restart(char *cmd) __noreturn;
68687+extern void kernel_halt(void) __noreturn;
68688+extern void kernel_power_off(void) __noreturn;
68689
68690 void ctrl_alt_del(void);
68691
68692@@ -75,7 +75,7 @@ extern int orderly_poweroff(bool force);
68693 * Emergency restart, callable from an interrupt handler.
68694 */
68695
68696-extern void emergency_restart(void);
68697+extern void emergency_restart(void) __noreturn;
68698 #include <asm/emergency-restart.h>
68699
68700 #endif
68701diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
68702index dd31e7b..5b03c5c 100644
68703--- a/include/linux/reiserfs_fs.h
68704+++ b/include/linux/reiserfs_fs.h
68705@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
68706 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
68707
68708 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
68709-#define get_generation(s) atomic_read (&fs_generation(s))
68710+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
68711 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
68712 #define __fs_changed(gen,s) (gen != get_generation (s))
68713 #define fs_changed(gen,s) ({cond_resched(); __fs_changed(gen, s);})
68714@@ -1534,24 +1534,24 @@ static inline struct super_block *sb_from_bi(struct buffer_info *bi)
68715 */
68716
68717 struct item_operations {
68718- int (*bytes_number) (struct item_head * ih, int block_size);
68719- void (*decrement_key) (struct cpu_key *);
68720- int (*is_left_mergeable) (struct reiserfs_key * ih,
68721+ int (* const bytes_number) (struct item_head * ih, int block_size);
68722+ void (* const decrement_key) (struct cpu_key *);
68723+ int (* const is_left_mergeable) (struct reiserfs_key * ih,
68724 unsigned long bsize);
68725- void (*print_item) (struct item_head *, char *item);
68726- void (*check_item) (struct item_head *, char *item);
68727+ void (* const print_item) (struct item_head *, char *item);
68728+ void (* const check_item) (struct item_head *, char *item);
68729
68730- int (*create_vi) (struct virtual_node * vn, struct virtual_item * vi,
68731+ int (* const create_vi) (struct virtual_node * vn, struct virtual_item * vi,
68732 int is_affected, int insert_size);
68733- int (*check_left) (struct virtual_item * vi, int free,
68734+ int (* const check_left) (struct virtual_item * vi, int free,
68735 int start_skip, int end_skip);
68736- int (*check_right) (struct virtual_item * vi, int free);
68737- int (*part_size) (struct virtual_item * vi, int from, int to);
68738- int (*unit_num) (struct virtual_item * vi);
68739- void (*print_vi) (struct virtual_item * vi);
68740+ int (* const check_right) (struct virtual_item * vi, int free);
68741+ int (* const part_size) (struct virtual_item * vi, int from, int to);
68742+ int (* const unit_num) (struct virtual_item * vi);
68743+ void (* const print_vi) (struct virtual_item * vi);
68744 };
68745
68746-extern struct item_operations *item_ops[TYPE_ANY + 1];
68747+extern const struct item_operations * const item_ops[TYPE_ANY + 1];
68748
68749 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
68750 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
68751diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
68752index dab68bb..0688727 100644
68753--- a/include/linux/reiserfs_fs_sb.h
68754+++ b/include/linux/reiserfs_fs_sb.h
68755@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
68756 /* Comment? -Hans */
68757 wait_queue_head_t s_wait;
68758 /* To be obsoleted soon by per buffer seals.. -Hans */
68759- atomic_t s_generation_counter; // increased by one every time the
68760+ atomic_unchecked_t s_generation_counter; // increased by one every time the
68761 // tree gets re-balanced
68762 unsigned long s_properties; /* File system properties. Currently holds
68763 on-disk FS format */
68764diff --git a/include/linux/relay.h b/include/linux/relay.h
68765index 14a86bc..17d0700 100644
68766--- a/include/linux/relay.h
68767+++ b/include/linux/relay.h
68768@@ -159,7 +159,7 @@ struct rchan_callbacks
68769 * The callback should return 0 if successful, negative if not.
68770 */
68771 int (*remove_buf_file)(struct dentry *dentry);
68772-};
68773+} __no_const;
68774
68775 /*
68776 * CONFIG_RELAY kernel API, kernel/relay.c
68777diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
68778index 3392c59..a746428 100644
68779--- a/include/linux/rfkill.h
68780+++ b/include/linux/rfkill.h
68781@@ -144,6 +144,7 @@ struct rfkill_ops {
68782 void (*query)(struct rfkill *rfkill, void *data);
68783 int (*set_block)(void *data, bool blocked);
68784 };
68785+typedef struct rfkill_ops __no_const rfkill_ops_no_const;
68786
68787 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
68788 /**
68789diff --git a/include/linux/sched.h b/include/linux/sched.h
68790index 71849bf..03ceae8 100644
68791--- a/include/linux/sched.h
68792+++ b/include/linux/sched.h
68793@@ -101,6 +101,7 @@ struct bio;
68794 struct fs_struct;
68795 struct bts_context;
68796 struct perf_event_context;
68797+struct linux_binprm;
68798
68799 /*
68800 * List of flags we want to share for kernel threads,
68801@@ -350,7 +351,7 @@ extern signed long schedule_timeout_killable(signed long timeout);
68802 extern signed long schedule_timeout_uninterruptible(signed long timeout);
68803 asmlinkage void __schedule(void);
68804 asmlinkage void schedule(void);
68805-extern int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner);
68806+extern int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner);
68807
68808 struct nsproxy;
68809 struct user_namespace;
68810@@ -371,9 +372,12 @@ struct user_namespace;
68811 #define DEFAULT_MAX_MAP_COUNT (USHORT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
68812
68813 extern int sysctl_max_map_count;
68814+extern unsigned long sysctl_heap_stack_gap;
68815
68816 #include <linux/aio.h>
68817
68818+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
68819+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
68820 extern unsigned long
68821 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
68822 unsigned long, unsigned long);
68823@@ -666,6 +670,16 @@ struct signal_struct {
68824 struct tty_audit_buf *tty_audit_buf;
68825 #endif
68826
68827+#ifdef CONFIG_GRKERNSEC
68828+ u32 curr_ip;
68829+ u32 saved_ip;
68830+ u32 gr_saddr;
68831+ u32 gr_daddr;
68832+ u16 gr_sport;
68833+ u16 gr_dport;
68834+ u8 used_accept:1;
68835+#endif
68836+
68837 int oom_adj; /* OOM kill score adjustment (bit shift) */
68838 };
68839
68840@@ -723,6 +737,11 @@ struct user_struct {
68841 struct key *session_keyring; /* UID's default session keyring */
68842 #endif
68843
68844+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
68845+ unsigned int banned;
68846+ unsigned long ban_expires;
68847+#endif
68848+
68849 /* Hash table maintenance information */
68850 struct hlist_node uidhash_node;
68851 uid_t uid;
68852@@ -1328,8 +1347,8 @@ struct task_struct {
68853 struct list_head thread_group;
68854
68855 struct completion *vfork_done; /* for vfork() */
68856- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
68857- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
68858+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
68859+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
68860
68861 cputime_t utime, stime, utimescaled, stimescaled;
68862 cputime_t gtime;
68863@@ -1343,16 +1362,6 @@ struct task_struct {
68864 struct task_cputime cputime_expires;
68865 struct list_head cpu_timers[3];
68866
68867-/* process credentials */
68868- const struct cred *real_cred; /* objective and real subjective task
68869- * credentials (COW) */
68870- const struct cred *cred; /* effective (overridable) subjective task
68871- * credentials (COW) */
68872- struct mutex cred_guard_mutex; /* guard against foreign influences on
68873- * credential calculations
68874- * (notably. ptrace) */
68875- struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
68876-
68877 char comm[TASK_COMM_LEN]; /* executable name excluding path
68878 - access with [gs]et_task_comm (which lock
68879 it with task_lock())
68880@@ -1369,6 +1378,10 @@ struct task_struct {
68881 #endif
68882 /* CPU-specific state of this task */
68883 struct thread_struct thread;
68884+/* thread_info moved to task_struct */
68885+#ifdef CONFIG_X86
68886+ struct thread_info tinfo;
68887+#endif
68888 /* filesystem information */
68889 struct fs_struct *fs;
68890 /* open file information */
68891@@ -1436,6 +1449,15 @@ struct task_struct {
68892 int hardirq_context;
68893 int softirq_context;
68894 #endif
68895+
68896+/* process credentials */
68897+ const struct cred *real_cred; /* objective and real subjective task
68898+ * credentials (COW) */
68899+ struct mutex cred_guard_mutex; /* guard against foreign influences on
68900+ * credential calculations
68901+ * (notably. ptrace) */
68902+ struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
68903+
68904 #ifdef CONFIG_LOCKDEP
68905 # define MAX_LOCK_DEPTH 48UL
68906 u64 curr_chain_key;
68907@@ -1456,6 +1478,9 @@ struct task_struct {
68908
68909 struct backing_dev_info *backing_dev_info;
68910
68911+ const struct cred *cred; /* effective (overridable) subjective task
68912+ * credentials (COW) */
68913+
68914 struct io_context *io_context;
68915
68916 unsigned long ptrace_message;
68917@@ -1519,6 +1544,27 @@ struct task_struct {
68918 unsigned long default_timer_slack_ns;
68919
68920 struct list_head *scm_work_list;
68921+
68922+#ifdef CONFIG_GRKERNSEC
68923+ /* grsecurity */
68924+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68925+ long long exec_id;
68926+#endif
68927+#ifdef CONFIG_GRKERNSEC_SETXID
68928+ const struct cred *delayed_cred;
68929+#endif
68930+ struct dentry *gr_chroot_dentry;
68931+ struct acl_subject_label *acl;
68932+ struct acl_role_label *role;
68933+ struct file *exec_file;
68934+ u16 acl_role_id;
68935+ /* is this the task that authenticated to the special role */
68936+ u8 acl_sp_role;
68937+ u8 is_writable;
68938+ u8 brute;
68939+ u8 gr_is_chrooted;
68940+#endif
68941+
68942 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
68943 /* Index of current stored adress in ret_stack */
68944 int curr_ret_stack;
68945@@ -1542,6 +1588,57 @@ struct task_struct {
68946 #endif /* CONFIG_TRACING */
68947 };
68948
68949+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
68950+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
68951+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
68952+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
68953+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
68954+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
68955+
68956+#ifdef CONFIG_PAX_SOFTMODE
68957+extern int pax_softmode;
68958+#endif
68959+
68960+extern int pax_check_flags(unsigned long *);
68961+
68962+/* if tsk != current then task_lock must be held on it */
68963+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
68964+static inline unsigned long pax_get_flags(struct task_struct *tsk)
68965+{
68966+ if (likely(tsk->mm))
68967+ return tsk->mm->pax_flags;
68968+ else
68969+ return 0UL;
68970+}
68971+
68972+/* if tsk != current then task_lock must be held on it */
68973+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
68974+{
68975+ if (likely(tsk->mm)) {
68976+ tsk->mm->pax_flags = flags;
68977+ return 0;
68978+ }
68979+ return -EINVAL;
68980+}
68981+#endif
68982+
68983+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
68984+extern void pax_set_initial_flags(struct linux_binprm *bprm);
68985+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
68986+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
68987+#endif
68988+
68989+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
68990+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
68991+extern void pax_report_refcount_overflow(struct pt_regs *regs);
68992+extern NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type) ATTRIB_NORET;
68993+
68994+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
68995+extern void pax_track_stack(void);
68996+#else
68997+static inline void pax_track_stack(void) {}
68998+#endif
68999+
69000 /* Future-safe accessor for struct task_struct's cpus_allowed. */
69001 #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
69002
69003@@ -1740,7 +1837,7 @@ extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *
69004 #define PF_DUMPCORE 0x00000200 /* dumped core */
69005 #define PF_SIGNALED 0x00000400 /* killed by a signal */
69006 #define PF_MEMALLOC 0x00000800 /* Allocating memory */
69007-#define PF_FLUSHER 0x00001000 /* responsible for disk writeback */
69008+#define PF_NPROC_EXCEEDED 0x00001000 /* set_user noticed that RLIMIT_NPROC was exceeded */
69009 #define PF_USED_MATH 0x00002000 /* if unset the fpu must be initialized before use */
69010 #define PF_FREEZING 0x00004000 /* freeze in progress. do not account to load */
69011 #define PF_NOFREEZE 0x00008000 /* this thread should not be frozen */
69012@@ -1978,7 +2075,9 @@ void yield(void);
69013 extern struct exec_domain default_exec_domain;
69014
69015 union thread_union {
69016+#ifndef CONFIG_X86
69017 struct thread_info thread_info;
69018+#endif
69019 unsigned long stack[THREAD_SIZE/sizeof(long)];
69020 };
69021
69022@@ -2011,6 +2110,7 @@ extern struct pid_namespace init_pid_ns;
69023 */
69024
69025 extern struct task_struct *find_task_by_vpid(pid_t nr);
69026+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
69027 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
69028 struct pid_namespace *ns);
69029
69030@@ -2155,7 +2255,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
69031 extern void exit_itimers(struct signal_struct *);
69032 extern void flush_itimer_signals(void);
69033
69034-extern NORET_TYPE void do_group_exit(int);
69035+extern NORET_TYPE void do_group_exit(int) ATTRIB_NORET;
69036
69037 extern void daemonize(const char *, ...);
69038 extern int allow_signal(int);
69039@@ -2284,13 +2384,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
69040
69041 #endif
69042
69043-static inline int object_is_on_stack(void *obj)
69044+static inline int object_starts_on_stack(void *obj)
69045 {
69046- void *stack = task_stack_page(current);
69047+ const void *stack = task_stack_page(current);
69048
69049 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
69050 }
69051
69052+#ifdef CONFIG_PAX_USERCOPY
69053+extern int object_is_on_stack(const void *obj, unsigned long len);
69054+#endif
69055+
69056 extern void thread_info_cache_init(void);
69057
69058 #ifdef CONFIG_DEBUG_STACK_USAGE
69059diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
69060index 1ee2c05..81b7ec4 100644
69061--- a/include/linux/screen_info.h
69062+++ b/include/linux/screen_info.h
69063@@ -42,7 +42,8 @@ struct screen_info {
69064 __u16 pages; /* 0x32 */
69065 __u16 vesa_attributes; /* 0x34 */
69066 __u32 capabilities; /* 0x36 */
69067- __u8 _reserved[6]; /* 0x3a */
69068+ __u16 vesapm_size; /* 0x3a */
69069+ __u8 _reserved[4]; /* 0x3c */
69070 } __attribute__((packed));
69071
69072 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
69073diff --git a/include/linux/security.h b/include/linux/security.h
69074index d40d23f..d739b08 100644
69075--- a/include/linux/security.h
69076+++ b/include/linux/security.h
69077@@ -34,6 +34,7 @@
69078 #include <linux/key.h>
69079 #include <linux/xfrm.h>
69080 #include <linux/gfp.h>
69081+#include <linux/grsecurity.h>
69082 #include <net/flow.h>
69083
69084 /* Maximum number of letters for an LSM name string */
69085@@ -76,7 +77,7 @@ extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
69086 extern int cap_task_setscheduler(struct task_struct *p, int policy, struct sched_param *lp);
69087 extern int cap_task_setioprio(struct task_struct *p, int ioprio);
69088 extern int cap_task_setnice(struct task_struct *p, int nice);
69089-extern int cap_syslog(int type);
69090+extern int cap_syslog(int type, bool from_file);
69091 extern int cap_vm_enough_memory(struct mm_struct *mm, long pages);
69092
69093 struct msghdr;
69094@@ -1331,6 +1332,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
69095 * logging to the console.
69096 * See the syslog(2) manual page for an explanation of the @type values.
69097 * @type contains the type of action.
69098+ * @from_file indicates the context of action (if it came from /proc).
69099 * Return 0 if permission is granted.
69100 * @settime:
69101 * Check permission to change the system time.
69102@@ -1445,7 +1447,7 @@ struct security_operations {
69103 int (*sysctl) (struct ctl_table *table, int op);
69104 int (*quotactl) (int cmds, int type, int id, struct super_block *sb);
69105 int (*quota_on) (struct dentry *dentry);
69106- int (*syslog) (int type);
69107+ int (*syslog) (int type, bool from_file);
69108 int (*settime) (struct timespec *ts, struct timezone *tz);
69109 int (*vm_enough_memory) (struct mm_struct *mm, long pages);
69110
69111@@ -1740,7 +1742,7 @@ int security_acct(struct file *file);
69112 int security_sysctl(struct ctl_table *table, int op);
69113 int security_quotactl(int cmds, int type, int id, struct super_block *sb);
69114 int security_quota_on(struct dentry *dentry);
69115-int security_syslog(int type);
69116+int security_syslog(int type, bool from_file);
69117 int security_settime(struct timespec *ts, struct timezone *tz);
69118 int security_vm_enough_memory(long pages);
69119 int security_vm_enough_memory_mm(struct mm_struct *mm, long pages);
69120@@ -1986,9 +1988,9 @@ static inline int security_quota_on(struct dentry *dentry)
69121 return 0;
69122 }
69123
69124-static inline int security_syslog(int type)
69125+static inline int security_syslog(int type, bool from_file)
69126 {
69127- return cap_syslog(type);
69128+ return cap_syslog(type, from_file);
69129 }
69130
69131 static inline int security_settime(struct timespec *ts, struct timezone *tz)
69132diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
69133index 8366d8f..898f3c6 100644
69134--- a/include/linux/seq_file.h
69135+++ b/include/linux/seq_file.h
69136@@ -23,6 +23,9 @@ struct seq_file {
69137 u64 version;
69138 struct mutex lock;
69139 const struct seq_operations *op;
69140+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
69141+ long long exec_id;
69142+#endif
69143 void *private;
69144 };
69145
69146@@ -32,6 +35,7 @@ struct seq_operations {
69147 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
69148 int (*show) (struct seq_file *m, void *v);
69149 };
69150+typedef struct seq_operations __no_const seq_operations_no_const;
69151
69152 #define SEQ_SKIP 1
69153
69154diff --git a/include/linux/shm.h b/include/linux/shm.h
69155index eca6235..c7417ed 100644
69156--- a/include/linux/shm.h
69157+++ b/include/linux/shm.h
69158@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the kernel */
69159 pid_t shm_cprid;
69160 pid_t shm_lprid;
69161 struct user_struct *mlock_user;
69162+#ifdef CONFIG_GRKERNSEC
69163+ time_t shm_createtime;
69164+ pid_t shm_lapid;
69165+#endif
69166 };
69167
69168 /* shm_mode upper byte flags */
69169diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
69170index bcdd660..6e12e11 100644
69171--- a/include/linux/skbuff.h
69172+++ b/include/linux/skbuff.h
69173@@ -14,6 +14,7 @@
69174 #ifndef _LINUX_SKBUFF_H
69175 #define _LINUX_SKBUFF_H
69176
69177+#include <linux/const.h>
69178 #include <linux/kernel.h>
69179 #include <linux/kmemcheck.h>
69180 #include <linux/compiler.h>
69181@@ -544,7 +545,7 @@ static inline union skb_shared_tx *skb_tx(struct sk_buff *skb)
69182 */
69183 static inline int skb_queue_empty(const struct sk_buff_head *list)
69184 {
69185- return list->next == (struct sk_buff *)list;
69186+ return list->next == (const struct sk_buff *)list;
69187 }
69188
69189 /**
69190@@ -557,7 +558,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
69191 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
69192 const struct sk_buff *skb)
69193 {
69194- return (skb->next == (struct sk_buff *) list);
69195+ return (skb->next == (const struct sk_buff *) list);
69196 }
69197
69198 /**
69199@@ -570,7 +571,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
69200 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
69201 const struct sk_buff *skb)
69202 {
69203- return (skb->prev == (struct sk_buff *) list);
69204+ return (skb->prev == (const struct sk_buff *) list);
69205 }
69206
69207 /**
69208@@ -1367,7 +1368,7 @@ static inline int skb_network_offset(const struct sk_buff *skb)
69209 * headroom, you should not reduce this.
69210 */
69211 #ifndef NET_SKB_PAD
69212-#define NET_SKB_PAD 32
69213+#define NET_SKB_PAD (_AC(32,UL))
69214 #endif
69215
69216 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
69217diff --git a/include/linux/slab.h b/include/linux/slab.h
69218index 2da8372..a3be824 100644
69219--- a/include/linux/slab.h
69220+++ b/include/linux/slab.h
69221@@ -11,12 +11,20 @@
69222
69223 #include <linux/gfp.h>
69224 #include <linux/types.h>
69225+#include <linux/err.h>
69226
69227 /*
69228 * Flags to pass to kmem_cache_create().
69229 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
69230 */
69231 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
69232+
69233+#ifdef CONFIG_PAX_USERCOPY
69234+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
69235+#else
69236+#define SLAB_USERCOPY 0x00000000UL
69237+#endif
69238+
69239 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
69240 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
69241 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
69242@@ -82,10 +90,13 @@
69243 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
69244 * Both make kfree a no-op.
69245 */
69246-#define ZERO_SIZE_PTR ((void *)16)
69247+#define ZERO_SIZE_PTR \
69248+({ \
69249+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
69250+ (void *)(-MAX_ERRNO-1L); \
69251+})
69252
69253-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
69254- (unsigned long)ZERO_SIZE_PTR)
69255+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
69256
69257 /*
69258 * struct kmem_cache related prototypes
69259@@ -138,6 +149,7 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
69260 void kfree(const void *);
69261 void kzfree(const void *);
69262 size_t ksize(const void *);
69263+void check_object_size(const void *ptr, unsigned long n, bool to);
69264
69265 /*
69266 * Allocator specific definitions. These are mainly used to establish optimized
69267@@ -328,4 +340,37 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node)
69268
69269 void __init kmem_cache_init_late(void);
69270
69271+#define kmalloc(x, y) \
69272+({ \
69273+ void *___retval; \
69274+ intoverflow_t ___x = (intoverflow_t)x; \
69275+ if (WARN(___x > ULONG_MAX, "kmalloc size overflow\n"))\
69276+ ___retval = NULL; \
69277+ else \
69278+ ___retval = kmalloc((size_t)___x, (y)); \
69279+ ___retval; \
69280+})
69281+
69282+#define kmalloc_node(x, y, z) \
69283+({ \
69284+ void *___retval; \
69285+ intoverflow_t ___x = (intoverflow_t)x; \
69286+ if (WARN(___x > ULONG_MAX, "kmalloc_node size overflow\n"))\
69287+ ___retval = NULL; \
69288+ else \
69289+ ___retval = kmalloc_node((size_t)___x, (y), (z));\
69290+ ___retval; \
69291+})
69292+
69293+#define kzalloc(x, y) \
69294+({ \
69295+ void *___retval; \
69296+ intoverflow_t ___x = (intoverflow_t)x; \
69297+ if (WARN(___x > ULONG_MAX, "kzalloc size overflow\n"))\
69298+ ___retval = NULL; \
69299+ else \
69300+ ___retval = kzalloc((size_t)___x, (y)); \
69301+ ___retval; \
69302+})
69303+
69304 #endif /* _LINUX_SLAB_H */
69305diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
69306index 850d057..d9dfe3c 100644
69307--- a/include/linux/slab_def.h
69308+++ b/include/linux/slab_def.h
69309@@ -69,10 +69,10 @@ struct kmem_cache {
69310 unsigned long node_allocs;
69311 unsigned long node_frees;
69312 unsigned long node_overflow;
69313- atomic_t allochit;
69314- atomic_t allocmiss;
69315- atomic_t freehit;
69316- atomic_t freemiss;
69317+ atomic_unchecked_t allochit;
69318+ atomic_unchecked_t allocmiss;
69319+ atomic_unchecked_t freehit;
69320+ atomic_unchecked_t freemiss;
69321
69322 /*
69323 * If debugging is enabled, then the allocator can add additional
69324diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
69325index 5ad70a6..57f9f65 100644
69326--- a/include/linux/slub_def.h
69327+++ b/include/linux/slub_def.h
69328@@ -86,7 +86,7 @@ struct kmem_cache {
69329 struct kmem_cache_order_objects max;
69330 struct kmem_cache_order_objects min;
69331 gfp_t allocflags; /* gfp flags to use on each alloc */
69332- int refcount; /* Refcount for slab cache destroy */
69333+ atomic_t refcount; /* Refcount for slab cache destroy */
69334 void (*ctor)(void *);
69335 int inuse; /* Offset to metadata */
69336 int align; /* Alignment */
69337@@ -215,7 +215,7 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
69338 #endif
69339
69340 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
69341-void *__kmalloc(size_t size, gfp_t flags);
69342+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
69343
69344 #ifdef CONFIG_KMEMTRACE
69345 extern void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags);
69346diff --git a/include/linux/sonet.h b/include/linux/sonet.h
69347index 67ad11f..0bbd8af 100644
69348--- a/include/linux/sonet.h
69349+++ b/include/linux/sonet.h
69350@@ -61,7 +61,7 @@ struct sonet_stats {
69351 #include <asm/atomic.h>
69352
69353 struct k_sonet_stats {
69354-#define __HANDLE_ITEM(i) atomic_t i
69355+#define __HANDLE_ITEM(i) atomic_unchecked_t i
69356 __SONET_ITEMS
69357 #undef __HANDLE_ITEM
69358 };
69359diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
69360index 6f52b4d..5500323 100644
69361--- a/include/linux/sunrpc/cache.h
69362+++ b/include/linux/sunrpc/cache.h
69363@@ -125,7 +125,7 @@ struct cache_detail {
69364 */
69365 struct cache_req {
69366 struct cache_deferred_req *(*defer)(struct cache_req *req);
69367-};
69368+} __no_const;
69369 /* this must be embedded in a deferred_request that is being
69370 * delayed awaiting cache-fill
69371 */
69372diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
69373index 8ed9642..101ceab 100644
69374--- a/include/linux/sunrpc/clnt.h
69375+++ b/include/linux/sunrpc/clnt.h
69376@@ -167,9 +167,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
69377 {
69378 switch (sap->sa_family) {
69379 case AF_INET:
69380- return ntohs(((struct sockaddr_in *)sap)->sin_port);
69381+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
69382 case AF_INET6:
69383- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
69384+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
69385 }
69386 return 0;
69387 }
69388@@ -202,7 +202,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
69389 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
69390 const struct sockaddr *src)
69391 {
69392- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
69393+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
69394 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
69395
69396 dsin->sin_family = ssin->sin_family;
69397@@ -299,7 +299,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
69398 if (sa->sa_family != AF_INET6)
69399 return 0;
69400
69401- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
69402+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
69403 }
69404
69405 #endif /* __KERNEL__ */
69406diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
69407index c14fe86..393245e 100644
69408--- a/include/linux/sunrpc/svc_rdma.h
69409+++ b/include/linux/sunrpc/svc_rdma.h
69410@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
69411 extern unsigned int svcrdma_max_requests;
69412 extern unsigned int svcrdma_max_req_size;
69413
69414-extern atomic_t rdma_stat_recv;
69415-extern atomic_t rdma_stat_read;
69416-extern atomic_t rdma_stat_write;
69417-extern atomic_t rdma_stat_sq_starve;
69418-extern atomic_t rdma_stat_rq_starve;
69419-extern atomic_t rdma_stat_rq_poll;
69420-extern atomic_t rdma_stat_rq_prod;
69421-extern atomic_t rdma_stat_sq_poll;
69422-extern atomic_t rdma_stat_sq_prod;
69423+extern atomic_unchecked_t rdma_stat_recv;
69424+extern atomic_unchecked_t rdma_stat_read;
69425+extern atomic_unchecked_t rdma_stat_write;
69426+extern atomic_unchecked_t rdma_stat_sq_starve;
69427+extern atomic_unchecked_t rdma_stat_rq_starve;
69428+extern atomic_unchecked_t rdma_stat_rq_poll;
69429+extern atomic_unchecked_t rdma_stat_rq_prod;
69430+extern atomic_unchecked_t rdma_stat_sq_poll;
69431+extern atomic_unchecked_t rdma_stat_sq_prod;
69432
69433 #define RPCRDMA_VERSION 1
69434
69435diff --git a/include/linux/suspend.h b/include/linux/suspend.h
69436index 5e781d8..1e62818 100644
69437--- a/include/linux/suspend.h
69438+++ b/include/linux/suspend.h
69439@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
69440 * which require special recovery actions in that situation.
69441 */
69442 struct platform_suspend_ops {
69443- int (*valid)(suspend_state_t state);
69444- int (*begin)(suspend_state_t state);
69445- int (*prepare)(void);
69446- int (*prepare_late)(void);
69447- int (*enter)(suspend_state_t state);
69448- void (*wake)(void);
69449- void (*finish)(void);
69450- void (*end)(void);
69451- void (*recover)(void);
69452+ int (* const valid)(suspend_state_t state);
69453+ int (* const begin)(suspend_state_t state);
69454+ int (* const prepare)(void);
69455+ int (* const prepare_late)(void);
69456+ int (* const enter)(suspend_state_t state);
69457+ void (* const wake)(void);
69458+ void (* const finish)(void);
69459+ void (* const end)(void);
69460+ void (* const recover)(void);
69461 };
69462
69463 #ifdef CONFIG_SUSPEND
69464@@ -120,7 +120,7 @@ struct platform_suspend_ops {
69465 * suspend_set_ops - set platform dependent suspend operations
69466 * @ops: The new suspend operations to set.
69467 */
69468-extern void suspend_set_ops(struct platform_suspend_ops *ops);
69469+extern void suspend_set_ops(const struct platform_suspend_ops *ops);
69470 extern int suspend_valid_only_mem(suspend_state_t state);
69471
69472 /**
69473@@ -145,7 +145,7 @@ extern int pm_suspend(suspend_state_t state);
69474 #else /* !CONFIG_SUSPEND */
69475 #define suspend_valid_only_mem NULL
69476
69477-static inline void suspend_set_ops(struct platform_suspend_ops *ops) {}
69478+static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {}
69479 static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
69480 #endif /* !CONFIG_SUSPEND */
69481
69482@@ -215,16 +215,16 @@ extern void mark_free_pages(struct zone *zone);
69483 * platforms which require special recovery actions in that situation.
69484 */
69485 struct platform_hibernation_ops {
69486- int (*begin)(void);
69487- void (*end)(void);
69488- int (*pre_snapshot)(void);
69489- void (*finish)(void);
69490- int (*prepare)(void);
69491- int (*enter)(void);
69492- void (*leave)(void);
69493- int (*pre_restore)(void);
69494- void (*restore_cleanup)(void);
69495- void (*recover)(void);
69496+ int (* const begin)(void);
69497+ void (* const end)(void);
69498+ int (* const pre_snapshot)(void);
69499+ void (* const finish)(void);
69500+ int (* const prepare)(void);
69501+ int (* const enter)(void);
69502+ void (* const leave)(void);
69503+ int (* const pre_restore)(void);
69504+ void (* const restore_cleanup)(void);
69505+ void (* const recover)(void);
69506 };
69507
69508 #ifdef CONFIG_HIBERNATION
69509@@ -243,7 +243,7 @@ extern void swsusp_set_page_free(struct page *);
69510 extern void swsusp_unset_page_free(struct page *);
69511 extern unsigned long get_safe_page(gfp_t gfp_mask);
69512
69513-extern void hibernation_set_ops(struct platform_hibernation_ops *ops);
69514+extern void hibernation_set_ops(const struct platform_hibernation_ops *ops);
69515 extern int hibernate(void);
69516 extern bool system_entering_hibernation(void);
69517 #else /* CONFIG_HIBERNATION */
69518@@ -251,7 +251,7 @@ static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
69519 static inline void swsusp_set_page_free(struct page *p) {}
69520 static inline void swsusp_unset_page_free(struct page *p) {}
69521
69522-static inline void hibernation_set_ops(struct platform_hibernation_ops *ops) {}
69523+static inline void hibernation_set_ops(const struct platform_hibernation_ops *ops) {}
69524 static inline int hibernate(void) { return -ENOSYS; }
69525 static inline bool system_entering_hibernation(void) { return false; }
69526 #endif /* CONFIG_HIBERNATION */
69527diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
69528index 0eb6942..a805cb6 100644
69529--- a/include/linux/sysctl.h
69530+++ b/include/linux/sysctl.h
69531@@ -164,7 +164,11 @@ enum
69532 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
69533 };
69534
69535-
69536+#ifdef CONFIG_PAX_SOFTMODE
69537+enum {
69538+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
69539+};
69540+#endif
69541
69542 /* CTL_VM names: */
69543 enum
69544@@ -982,6 +986,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
69545
69546 extern int proc_dostring(struct ctl_table *, int,
69547 void __user *, size_t *, loff_t *);
69548+extern int proc_dostring_modpriv(struct ctl_table *, int,
69549+ void __user *, size_t *, loff_t *);
69550 extern int proc_dointvec(struct ctl_table *, int,
69551 void __user *, size_t *, loff_t *);
69552 extern int proc_dointvec_minmax(struct ctl_table *, int,
69553@@ -1003,6 +1009,7 @@ extern int do_sysctl (int __user *name, int nlen,
69554
69555 extern ctl_handler sysctl_data;
69556 extern ctl_handler sysctl_string;
69557+extern ctl_handler sysctl_string_modpriv;
69558 extern ctl_handler sysctl_intvec;
69559 extern ctl_handler sysctl_jiffies;
69560 extern ctl_handler sysctl_ms_jiffies;
69561diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
69562index 9d68fed..71f02cc 100644
69563--- a/include/linux/sysfs.h
69564+++ b/include/linux/sysfs.h
69565@@ -75,8 +75,8 @@ struct bin_attribute {
69566 };
69567
69568 struct sysfs_ops {
69569- ssize_t (*show)(struct kobject *, struct attribute *,char *);
69570- ssize_t (*store)(struct kobject *,struct attribute *,const char *, size_t);
69571+ ssize_t (* const show)(struct kobject *, struct attribute *,char *);
69572+ ssize_t (* const store)(struct kobject *,struct attribute *,const char *, size_t);
69573 };
69574
69575 struct sysfs_dirent;
69576diff --git a/include/linux/syslog.h b/include/linux/syslog.h
69577new file mode 100644
69578index 0000000..3891139
69579--- /dev/null
69580+++ b/include/linux/syslog.h
69581@@ -0,0 +1,52 @@
69582+/* Syslog internals
69583+ *
69584+ * Copyright 2010 Canonical, Ltd.
69585+ * Author: Kees Cook <kees.cook@canonical.com>
69586+ *
69587+ * This program is free software; you can redistribute it and/or modify
69588+ * it under the terms of the GNU General Public License as published by
69589+ * the Free Software Foundation; either version 2, or (at your option)
69590+ * any later version.
69591+ *
69592+ * This program is distributed in the hope that it will be useful,
69593+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
69594+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69595+ * GNU General Public License for more details.
69596+ *
69597+ * You should have received a copy of the GNU General Public License
69598+ * along with this program; see the file COPYING. If not, write to
69599+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
69600+ */
69601+
69602+#ifndef _LINUX_SYSLOG_H
69603+#define _LINUX_SYSLOG_H
69604+
69605+/* Close the log. Currently a NOP. */
69606+#define SYSLOG_ACTION_CLOSE 0
69607+/* Open the log. Currently a NOP. */
69608+#define SYSLOG_ACTION_OPEN 1
69609+/* Read from the log. */
69610+#define SYSLOG_ACTION_READ 2
69611+/* Read all messages remaining in the ring buffer. */
69612+#define SYSLOG_ACTION_READ_ALL 3
69613+/* Read and clear all messages remaining in the ring buffer */
69614+#define SYSLOG_ACTION_READ_CLEAR 4
69615+/* Clear ring buffer. */
69616+#define SYSLOG_ACTION_CLEAR 5
69617+/* Disable printk's to console */
69618+#define SYSLOG_ACTION_CONSOLE_OFF 6
69619+/* Enable printk's to console */
69620+#define SYSLOG_ACTION_CONSOLE_ON 7
69621+/* Set level of messages printed to console */
69622+#define SYSLOG_ACTION_CONSOLE_LEVEL 8
69623+/* Return number of unread characters in the log buffer */
69624+#define SYSLOG_ACTION_SIZE_UNREAD 9
69625+/* Return size of the log buffer */
69626+#define SYSLOG_ACTION_SIZE_BUFFER 10
69627+
69628+#define SYSLOG_FROM_CALL 0
69629+#define SYSLOG_FROM_FILE 1
69630+
69631+int do_syslog(int type, char __user *buf, int count, bool from_file);
69632+
69633+#endif /* _LINUX_SYSLOG_H */
69634diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
69635index a8cc4e1..98d3b85 100644
69636--- a/include/linux/thread_info.h
69637+++ b/include/linux/thread_info.h
69638@@ -23,7 +23,7 @@ struct restart_block {
69639 };
69640 /* For futex_wait and futex_wait_requeue_pi */
69641 struct {
69642- u32 *uaddr;
69643+ u32 __user *uaddr;
69644 u32 val;
69645 u32 flags;
69646 u32 bitset;
69647diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
69648index 1eb44a9..f582df3 100644
69649--- a/include/linux/tracehook.h
69650+++ b/include/linux/tracehook.h
69651@@ -69,12 +69,12 @@ static inline int tracehook_expect_breakpoints(struct task_struct *task)
69652 /*
69653 * ptrace report for syscall entry and exit looks identical.
69654 */
69655-static inline void ptrace_report_syscall(struct pt_regs *regs)
69656+static inline int ptrace_report_syscall(struct pt_regs *regs)
69657 {
69658 int ptrace = task_ptrace(current);
69659
69660 if (!(ptrace & PT_PTRACED))
69661- return;
69662+ return 0;
69663
69664 ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
69665
69666@@ -87,6 +87,8 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
69667 send_sig(current->exit_code, current, 1);
69668 current->exit_code = 0;
69669 }
69670+
69671+ return fatal_signal_pending(current);
69672 }
69673
69674 /**
69675@@ -111,8 +113,7 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
69676 static inline __must_check int tracehook_report_syscall_entry(
69677 struct pt_regs *regs)
69678 {
69679- ptrace_report_syscall(regs);
69680- return 0;
69681+ return ptrace_report_syscall(regs);
69682 }
69683
69684 /**
69685diff --git a/include/linux/tty.h b/include/linux/tty.h
69686index e9c57e9..ee6d489 100644
69687--- a/include/linux/tty.h
69688+++ b/include/linux/tty.h
69689@@ -493,7 +493,6 @@ extern void tty_ldisc_begin(void);
69690 /* This last one is just for the tty layer internals and shouldn't be used elsewhere */
69691 extern void tty_ldisc_enable(struct tty_struct *tty);
69692
69693-
69694 /* n_tty.c */
69695 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
69696
69697diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
69698index 0c4ee9b..9f7c426 100644
69699--- a/include/linux/tty_ldisc.h
69700+++ b/include/linux/tty_ldisc.h
69701@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
69702
69703 struct module *owner;
69704
69705- int refcount;
69706+ atomic_t refcount;
69707 };
69708
69709 struct tty_ldisc {
69710diff --git a/include/linux/types.h b/include/linux/types.h
69711index c42724f..d190eee 100644
69712--- a/include/linux/types.h
69713+++ b/include/linux/types.h
69714@@ -191,10 +191,26 @@ typedef struct {
69715 volatile int counter;
69716 } atomic_t;
69717
69718+#ifdef CONFIG_PAX_REFCOUNT
69719+typedef struct {
69720+ volatile int counter;
69721+} atomic_unchecked_t;
69722+#else
69723+typedef atomic_t atomic_unchecked_t;
69724+#endif
69725+
69726 #ifdef CONFIG_64BIT
69727 typedef struct {
69728 volatile long counter;
69729 } atomic64_t;
69730+
69731+#ifdef CONFIG_PAX_REFCOUNT
69732+typedef struct {
69733+ volatile long counter;
69734+} atomic64_unchecked_t;
69735+#else
69736+typedef atomic64_t atomic64_unchecked_t;
69737+#endif
69738 #endif
69739
69740 struct ustat {
69741diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
69742index 6b58367..53a3e8e 100644
69743--- a/include/linux/uaccess.h
69744+++ b/include/linux/uaccess.h
69745@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
69746 long ret; \
69747 mm_segment_t old_fs = get_fs(); \
69748 \
69749- set_fs(KERNEL_DS); \
69750 pagefault_disable(); \
69751- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
69752- pagefault_enable(); \
69753+ set_fs(KERNEL_DS); \
69754+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
69755 set_fs(old_fs); \
69756+ pagefault_enable(); \
69757 ret; \
69758 })
69759
69760@@ -93,7 +93,7 @@ static inline unsigned long __copy_from_user_nocache(void *to,
69761 * Safely read from address @src to the buffer at @dst. If a kernel fault
69762 * happens, handle that and return -EFAULT.
69763 */
69764-extern long probe_kernel_read(void *dst, void *src, size_t size);
69765+extern long probe_kernel_read(void *dst, const void *src, size_t size);
69766
69767 /*
69768 * probe_kernel_write(): safely attempt to write to a location
69769@@ -104,6 +104,6 @@ extern long probe_kernel_read(void *dst, void *src, size_t size);
69770 * Safely write to address @dst from the buffer at @src. If a kernel fault
69771 * happens, handle that and return -EFAULT.
69772 */
69773-extern long probe_kernel_write(void *dst, void *src, size_t size);
69774+extern long probe_kernel_write(void *dst, const void *src, size_t size);
69775
69776 #endif /* __LINUX_UACCESS_H__ */
69777diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
69778index 99c1b4d..bb94261 100644
69779--- a/include/linux/unaligned/access_ok.h
69780+++ b/include/linux/unaligned/access_ok.h
69781@@ -6,32 +6,32 @@
69782
69783 static inline u16 get_unaligned_le16(const void *p)
69784 {
69785- return le16_to_cpup((__le16 *)p);
69786+ return le16_to_cpup((const __le16 *)p);
69787 }
69788
69789 static inline u32 get_unaligned_le32(const void *p)
69790 {
69791- return le32_to_cpup((__le32 *)p);
69792+ return le32_to_cpup((const __le32 *)p);
69793 }
69794
69795 static inline u64 get_unaligned_le64(const void *p)
69796 {
69797- return le64_to_cpup((__le64 *)p);
69798+ return le64_to_cpup((const __le64 *)p);
69799 }
69800
69801 static inline u16 get_unaligned_be16(const void *p)
69802 {
69803- return be16_to_cpup((__be16 *)p);
69804+ return be16_to_cpup((const __be16 *)p);
69805 }
69806
69807 static inline u32 get_unaligned_be32(const void *p)
69808 {
69809- return be32_to_cpup((__be32 *)p);
69810+ return be32_to_cpup((const __be32 *)p);
69811 }
69812
69813 static inline u64 get_unaligned_be64(const void *p)
69814 {
69815- return be64_to_cpup((__be64 *)p);
69816+ return be64_to_cpup((const __be64 *)p);
69817 }
69818
69819 static inline void put_unaligned_le16(u16 val, void *p)
69820diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
69821index 79b9837..b5a56f9 100644
69822--- a/include/linux/vermagic.h
69823+++ b/include/linux/vermagic.h
69824@@ -26,9 +26,35 @@
69825 #define MODULE_ARCH_VERMAGIC ""
69826 #endif
69827
69828+#ifdef CONFIG_PAX_REFCOUNT
69829+#define MODULE_PAX_REFCOUNT "REFCOUNT "
69830+#else
69831+#define MODULE_PAX_REFCOUNT ""
69832+#endif
69833+
69834+#ifdef CONSTIFY_PLUGIN
69835+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
69836+#else
69837+#define MODULE_CONSTIFY_PLUGIN ""
69838+#endif
69839+
69840+#ifdef STACKLEAK_PLUGIN
69841+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
69842+#else
69843+#define MODULE_STACKLEAK_PLUGIN ""
69844+#endif
69845+
69846+#ifdef CONFIG_GRKERNSEC
69847+#define MODULE_GRSEC "GRSEC "
69848+#else
69849+#define MODULE_GRSEC ""
69850+#endif
69851+
69852 #define VERMAGIC_STRING \
69853 UTS_RELEASE " " \
69854 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
69855 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
69856- MODULE_ARCH_VERMAGIC
69857+ MODULE_ARCH_VERMAGIC \
69858+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
69859+ MODULE_GRSEC
69860
69861diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
69862index 819a634..462ac12 100644
69863--- a/include/linux/vmalloc.h
69864+++ b/include/linux/vmalloc.h
69865@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
69866 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
69867 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
69868 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
69869+
69870+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
69871+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
69872+#endif
69873+
69874 /* bits [20..32] reserved for arch specific ioremap internals */
69875
69876 /*
69877@@ -124,4 +129,81 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
69878
69879 void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);
69880
69881+#define vmalloc(x) \
69882+({ \
69883+ void *___retval; \
69884+ intoverflow_t ___x = (intoverflow_t)x; \
69885+ if (WARN(___x > ULONG_MAX, "vmalloc size overflow\n")) \
69886+ ___retval = NULL; \
69887+ else \
69888+ ___retval = vmalloc((unsigned long)___x); \
69889+ ___retval; \
69890+})
69891+
69892+#define __vmalloc(x, y, z) \
69893+({ \
69894+ void *___retval; \
69895+ intoverflow_t ___x = (intoverflow_t)x; \
69896+ if (WARN(___x > ULONG_MAX, "__vmalloc size overflow\n"))\
69897+ ___retval = NULL; \
69898+ else \
69899+ ___retval = __vmalloc((unsigned long)___x, (y), (z));\
69900+ ___retval; \
69901+})
69902+
69903+#define vmalloc_user(x) \
69904+({ \
69905+ void *___retval; \
69906+ intoverflow_t ___x = (intoverflow_t)x; \
69907+ if (WARN(___x > ULONG_MAX, "vmalloc_user size overflow\n"))\
69908+ ___retval = NULL; \
69909+ else \
69910+ ___retval = vmalloc_user((unsigned long)___x); \
69911+ ___retval; \
69912+})
69913+
69914+#define vmalloc_exec(x) \
69915+({ \
69916+ void *___retval; \
69917+ intoverflow_t ___x = (intoverflow_t)x; \
69918+ if (WARN(___x > ULONG_MAX, "vmalloc_exec size overflow\n"))\
69919+ ___retval = NULL; \
69920+ else \
69921+ ___retval = vmalloc_exec((unsigned long)___x); \
69922+ ___retval; \
69923+})
69924+
69925+#define vmalloc_node(x, y) \
69926+({ \
69927+ void *___retval; \
69928+ intoverflow_t ___x = (intoverflow_t)x; \
69929+ if (WARN(___x > ULONG_MAX, "vmalloc_node size overflow\n"))\
69930+ ___retval = NULL; \
69931+ else \
69932+ ___retval = vmalloc_node((unsigned long)___x, (y));\
69933+ ___retval; \
69934+})
69935+
69936+#define vmalloc_32(x) \
69937+({ \
69938+ void *___retval; \
69939+ intoverflow_t ___x = (intoverflow_t)x; \
69940+ if (WARN(___x > ULONG_MAX, "vmalloc_32 size overflow\n"))\
69941+ ___retval = NULL; \
69942+ else \
69943+ ___retval = vmalloc_32((unsigned long)___x); \
69944+ ___retval; \
69945+})
69946+
69947+#define vmalloc_32_user(x) \
69948+({ \
69949+ void *___retval; \
69950+ intoverflow_t ___x = (intoverflow_t)x; \
69951+ if (WARN(___x > ULONG_MAX, "vmalloc_32_user size overflow\n"))\
69952+ ___retval = NULL; \
69953+ else \
69954+ ___retval = vmalloc_32_user((unsigned long)___x);\
69955+ ___retval; \
69956+})
69957+
69958 #endif /* _LINUX_VMALLOC_H */
69959diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
69960index 13070d6..aa4159a 100644
69961--- a/include/linux/vmstat.h
69962+++ b/include/linux/vmstat.h
69963@@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(int cpu)
69964 /*
69965 * Zone based page accounting with per cpu differentials.
69966 */
69967-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
69968+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
69969
69970 static inline void zone_page_state_add(long x, struct zone *zone,
69971 enum zone_stat_item item)
69972 {
69973- atomic_long_add(x, &zone->vm_stat[item]);
69974- atomic_long_add(x, &vm_stat[item]);
69975+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
69976+ atomic_long_add_unchecked(x, &vm_stat[item]);
69977 }
69978
69979 static inline unsigned long global_page_state(enum zone_stat_item item)
69980 {
69981- long x = atomic_long_read(&vm_stat[item]);
69982+ long x = atomic_long_read_unchecked(&vm_stat[item]);
69983 #ifdef CONFIG_SMP
69984 if (x < 0)
69985 x = 0;
69986@@ -158,7 +158,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
69987 static inline unsigned long zone_page_state(struct zone *zone,
69988 enum zone_stat_item item)
69989 {
69990- long x = atomic_long_read(&zone->vm_stat[item]);
69991+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
69992 #ifdef CONFIG_SMP
69993 if (x < 0)
69994 x = 0;
69995@@ -175,7 +175,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
69996 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
69997 enum zone_stat_item item)
69998 {
69999- long x = atomic_long_read(&zone->vm_stat[item]);
70000+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
70001
70002 #ifdef CONFIG_SMP
70003 int cpu;
70004@@ -264,8 +264,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
70005
70006 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
70007 {
70008- atomic_long_inc(&zone->vm_stat[item]);
70009- atomic_long_inc(&vm_stat[item]);
70010+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
70011+ atomic_long_inc_unchecked(&vm_stat[item]);
70012 }
70013
70014 static inline void __inc_zone_page_state(struct page *page,
70015@@ -276,8 +276,8 @@ static inline void __inc_zone_page_state(struct page *page,
70016
70017 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
70018 {
70019- atomic_long_dec(&zone->vm_stat[item]);
70020- atomic_long_dec(&vm_stat[item]);
70021+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
70022+ atomic_long_dec_unchecked(&vm_stat[item]);
70023 }
70024
70025 static inline void __dec_zone_page_state(struct page *page,
70026diff --git a/include/linux/xattr.h b/include/linux/xattr.h
70027index 5c84af8..1a3b6e2 100644
70028--- a/include/linux/xattr.h
70029+++ b/include/linux/xattr.h
70030@@ -33,6 +33,11 @@
70031 #define XATTR_USER_PREFIX "user."
70032 #define XATTR_USER_PREFIX_LEN (sizeof (XATTR_USER_PREFIX) - 1)
70033
70034+/* User namespace */
70035+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
70036+#define XATTR_PAX_FLAGS_SUFFIX "flags"
70037+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
70038+
70039 struct inode;
70040 struct dentry;
70041
70042diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
70043index eed5fcc..5080d24 100644
70044--- a/include/media/saa7146_vv.h
70045+++ b/include/media/saa7146_vv.h
70046@@ -167,7 +167,7 @@ struct saa7146_ext_vv
70047 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
70048
70049 /* the extension can override this */
70050- struct v4l2_ioctl_ops ops;
70051+ v4l2_ioctl_ops_no_const ops;
70052 /* pointer to the saa7146 core ops */
70053 const struct v4l2_ioctl_ops *core_ops;
70054
70055diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
70056index 73c9867..2da8837 100644
70057--- a/include/media/v4l2-dev.h
70058+++ b/include/media/v4l2-dev.h
70059@@ -34,7 +34,7 @@ struct v4l2_device;
70060 #define V4L2_FL_UNREGISTERED (0)
70061
70062 struct v4l2_file_operations {
70063- struct module *owner;
70064+ struct module * const owner;
70065 ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
70066 ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
70067 unsigned int (*poll) (struct file *, struct poll_table_struct *);
70068@@ -46,6 +46,7 @@ struct v4l2_file_operations {
70069 int (*open) (struct file *);
70070 int (*release) (struct file *);
70071 };
70072+typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
70073
70074 /*
70075 * Newer version of video_device, handled by videodev2.c
70076diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
70077index 5d5d550..f559ef1 100644
70078--- a/include/media/v4l2-device.h
70079+++ b/include/media/v4l2-device.h
70080@@ -71,7 +71,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
70081 this function returns 0. If the name ends with a digit (e.g. cx18),
70082 then the name will be set to cx18-0 since cx180 looks really odd. */
70083 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
70084- atomic_t *instance);
70085+ atomic_unchecked_t *instance);
70086
70087 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
70088 Since the parent disappears this ensures that v4l2_dev doesn't have an
70089diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
70090index 7a4529d..7244290 100644
70091--- a/include/media/v4l2-ioctl.h
70092+++ b/include/media/v4l2-ioctl.h
70093@@ -243,6 +243,7 @@ struct v4l2_ioctl_ops {
70094 long (*vidioc_default) (struct file *file, void *fh,
70095 int cmd, void *arg);
70096 };
70097+typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
70098
70099
70100 /* v4l debugging and diagnostics */
70101diff --git a/include/net/flow.h b/include/net/flow.h
70102index 809970b..c3df4f3 100644
70103--- a/include/net/flow.h
70104+++ b/include/net/flow.h
70105@@ -92,7 +92,7 @@ typedef int (*flow_resolve_t)(struct net *net, struct flowi *key, u16 family,
70106 extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family,
70107 u8 dir, flow_resolve_t resolver);
70108 extern void flow_cache_flush(void);
70109-extern atomic_t flow_cache_genid;
70110+extern atomic_unchecked_t flow_cache_genid;
70111
70112 static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
70113 {
70114diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
70115index 15e1f8fe..668837c 100644
70116--- a/include/net/inetpeer.h
70117+++ b/include/net/inetpeer.h
70118@@ -24,7 +24,7 @@ struct inet_peer
70119 __u32 dtime; /* the time of last use of not
70120 * referenced entries */
70121 atomic_t refcnt;
70122- atomic_t rid; /* Frag reception counter */
70123+ atomic_unchecked_t rid; /* Frag reception counter */
70124 __u32 tcp_ts;
70125 unsigned long tcp_ts_stamp;
70126 };
70127diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
70128index 98978e7..2243a3d 100644
70129--- a/include/net/ip_vs.h
70130+++ b/include/net/ip_vs.h
70131@@ -365,7 +365,7 @@ struct ip_vs_conn {
70132 struct ip_vs_conn *control; /* Master control connection */
70133 atomic_t n_control; /* Number of controlled ones */
70134 struct ip_vs_dest *dest; /* real server */
70135- atomic_t in_pkts; /* incoming packet counter */
70136+ atomic_unchecked_t in_pkts; /* incoming packet counter */
70137
70138 /* packet transmitter for different forwarding methods. If it
70139 mangles the packet, it must return NF_DROP or better NF_STOLEN,
70140@@ -466,7 +466,7 @@ struct ip_vs_dest {
70141 union nf_inet_addr addr; /* IP address of the server */
70142 __be16 port; /* port number of the server */
70143 volatile unsigned flags; /* dest status flags */
70144- atomic_t conn_flags; /* flags to copy to conn */
70145+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
70146 atomic_t weight; /* server weight */
70147
70148 atomic_t refcnt; /* reference counter */
70149diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
70150index 69b610a..fe3962c 100644
70151--- a/include/net/irda/ircomm_core.h
70152+++ b/include/net/irda/ircomm_core.h
70153@@ -51,7 +51,7 @@ typedef struct {
70154 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
70155 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
70156 struct ircomm_info *);
70157-} call_t;
70158+} __no_const call_t;
70159
70160 struct ircomm_cb {
70161 irda_queue_t queue;
70162diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
70163index eea2e61..08c692d 100644
70164--- a/include/net/irda/ircomm_tty.h
70165+++ b/include/net/irda/ircomm_tty.h
70166@@ -35,6 +35,7 @@
70167 #include <linux/termios.h>
70168 #include <linux/timer.h>
70169 #include <linux/tty.h> /* struct tty_struct */
70170+#include <asm/local.h>
70171
70172 #include <net/irda/irias_object.h>
70173 #include <net/irda/ircomm_core.h>
70174@@ -105,8 +106,8 @@ struct ircomm_tty_cb {
70175 unsigned short close_delay;
70176 unsigned short closing_wait; /* time to wait before closing */
70177
70178- int open_count;
70179- int blocked_open; /* # of blocked opens */
70180+ local_t open_count;
70181+ local_t blocked_open; /* # of blocked opens */
70182
70183 /* Protect concurent access to :
70184 * o self->open_count
70185diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
70186index f82a1e8..82d81e8 100644
70187--- a/include/net/iucv/af_iucv.h
70188+++ b/include/net/iucv/af_iucv.h
70189@@ -87,7 +87,7 @@ struct iucv_sock {
70190 struct iucv_sock_list {
70191 struct hlist_head head;
70192 rwlock_t lock;
70193- atomic_t autobind_name;
70194+ atomic_unchecked_t autobind_name;
70195 };
70196
70197 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
70198diff --git a/include/net/lapb.h b/include/net/lapb.h
70199index 96cb5dd..25e8d4f 100644
70200--- a/include/net/lapb.h
70201+++ b/include/net/lapb.h
70202@@ -95,7 +95,7 @@ struct lapb_cb {
70203 struct sk_buff_head write_queue;
70204 struct sk_buff_head ack_queue;
70205 unsigned char window;
70206- struct lapb_register_struct callbacks;
70207+ struct lapb_register_struct *callbacks;
70208
70209 /* FRMR control information */
70210 struct lapb_frame frmr_data;
70211diff --git a/include/net/neighbour.h b/include/net/neighbour.h
70212index 3817fda..cdb2343 100644
70213--- a/include/net/neighbour.h
70214+++ b/include/net/neighbour.h
70215@@ -131,7 +131,7 @@ struct neigh_ops
70216 int (*connected_output)(struct sk_buff*);
70217 int (*hh_output)(struct sk_buff*);
70218 int (*queue_xmit)(struct sk_buff*);
70219-};
70220+} __do_const;
70221
70222 struct pneigh_entry
70223 {
70224diff --git a/include/net/netlink.h b/include/net/netlink.h
70225index c344646..4778c71 100644
70226--- a/include/net/netlink.h
70227+++ b/include/net/netlink.h
70228@@ -335,7 +335,7 @@ static inline int nlmsg_ok(const struct nlmsghdr *nlh, int remaining)
70229 {
70230 return (remaining >= (int) sizeof(struct nlmsghdr) &&
70231 nlh->nlmsg_len >= sizeof(struct nlmsghdr) &&
70232- nlh->nlmsg_len <= remaining);
70233+ nlh->nlmsg_len <= (unsigned int)remaining);
70234 }
70235
70236 /**
70237@@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
70238 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
70239 {
70240 if (mark)
70241- skb_trim(skb, (unsigned char *) mark - skb->data);
70242+ skb_trim(skb, (const unsigned char *) mark - skb->data);
70243 }
70244
70245 /**
70246diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
70247index 9a4b8b7..e49e077 100644
70248--- a/include/net/netns/ipv4.h
70249+++ b/include/net/netns/ipv4.h
70250@@ -54,7 +54,7 @@ struct netns_ipv4 {
70251 int current_rt_cache_rebuild_count;
70252
70253 struct timer_list rt_secret_timer;
70254- atomic_t rt_genid;
70255+ atomic_unchecked_t rt_genid;
70256
70257 #ifdef CONFIG_IP_MROUTE
70258 struct sock *mroute_sk;
70259diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
70260index 8a6d529..171f401 100644
70261--- a/include/net/sctp/sctp.h
70262+++ b/include/net/sctp/sctp.h
70263@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
70264
70265 #else /* SCTP_DEBUG */
70266
70267-#define SCTP_DEBUG_PRINTK(whatever...)
70268-#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
70269+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
70270+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
70271 #define SCTP_ENABLE_DEBUG
70272 #define SCTP_DISABLE_DEBUG
70273 #define SCTP_ASSERT(expr, str, func)
70274diff --git a/include/net/secure_seq.h b/include/net/secure_seq.h
70275index d97f689..f3b90ab 100644
70276--- a/include/net/secure_seq.h
70277+++ b/include/net/secure_seq.h
70278@@ -7,14 +7,14 @@ extern __u32 secure_ip_id(__be32 daddr);
70279 extern __u32 secure_ipv6_id(const __be32 daddr[4]);
70280 extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
70281 extern u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
70282- __be16 dport);
70283+ __be16 dport);
70284 extern __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
70285 __be16 sport, __be16 dport);
70286 extern __u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
70287- __be16 sport, __be16 dport);
70288+ __be16 sport, __be16 dport);
70289 extern u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
70290- __be16 sport, __be16 dport);
70291+ __be16 sport, __be16 dport);
70292 extern u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr,
70293- __be16 sport, __be16 dport);
70294+ __be16 sport, __be16 dport);
70295
70296 #endif /* _NET_SECURE_SEQ */
70297diff --git a/include/net/sock.h b/include/net/sock.h
70298index 78adf52..99afd29 100644
70299--- a/include/net/sock.h
70300+++ b/include/net/sock.h
70301@@ -272,7 +272,7 @@ struct sock {
70302 rwlock_t sk_callback_lock;
70303 int sk_err,
70304 sk_err_soft;
70305- atomic_t sk_drops;
70306+ atomic_unchecked_t sk_drops;
70307 unsigned short sk_ack_backlog;
70308 unsigned short sk_max_ack_backlog;
70309 __u32 sk_priority;
70310@@ -737,7 +737,7 @@ static inline void sk_refcnt_debug_release(const struct sock *sk)
70311 extern void sock_prot_inuse_add(struct net *net, struct proto *prot, int inc);
70312 extern int sock_prot_inuse_get(struct net *net, struct proto *proto);
70313 #else
70314-static void inline sock_prot_inuse_add(struct net *net, struct proto *prot,
70315+static inline void sock_prot_inuse_add(struct net *net, struct proto *prot,
70316 int inc)
70317 {
70318 }
70319diff --git a/include/net/tcp.h b/include/net/tcp.h
70320index 6cfe18b..dd21acb 100644
70321--- a/include/net/tcp.h
70322+++ b/include/net/tcp.h
70323@@ -1444,8 +1444,8 @@ enum tcp_seq_states {
70324 struct tcp_seq_afinfo {
70325 char *name;
70326 sa_family_t family;
70327- struct file_operations seq_fops;
70328- struct seq_operations seq_ops;
70329+ file_operations_no_const seq_fops;
70330+ seq_operations_no_const seq_ops;
70331 };
70332
70333 struct tcp_iter_state {
70334diff --git a/include/net/udp.h b/include/net/udp.h
70335index f98abd2..b4b042f 100644
70336--- a/include/net/udp.h
70337+++ b/include/net/udp.h
70338@@ -187,8 +187,8 @@ struct udp_seq_afinfo {
70339 char *name;
70340 sa_family_t family;
70341 struct udp_table *udp_table;
70342- struct file_operations seq_fops;
70343- struct seq_operations seq_ops;
70344+ file_operations_no_const seq_fops;
70345+ seq_operations_no_const seq_ops;
70346 };
70347
70348 struct udp_iter_state {
70349diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
70350index cbb822e..e9c1cbe 100644
70351--- a/include/rdma/iw_cm.h
70352+++ b/include/rdma/iw_cm.h
70353@@ -129,7 +129,7 @@ struct iw_cm_verbs {
70354 int backlog);
70355
70356 int (*destroy_listen)(struct iw_cm_id *cm_id);
70357-};
70358+} __no_const;
70359
70360 /**
70361 * iw_create_cm_id - Create an IW CM identifier.
70362diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
70363index 09a124b..caa8ca8 100644
70364--- a/include/scsi/libfc.h
70365+++ b/include/scsi/libfc.h
70366@@ -675,6 +675,7 @@ struct libfc_function_template {
70367 */
70368 void (*disc_stop_final) (struct fc_lport *);
70369 };
70370+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
70371
70372 /* information used by the discovery layer */
70373 struct fc_disc {
70374@@ -707,7 +708,7 @@ struct fc_lport {
70375 struct fc_disc disc;
70376
70377 /* Operational Information */
70378- struct libfc_function_template tt;
70379+ libfc_function_template_no_const tt;
70380 u8 link_up;
70381 u8 qfull;
70382 enum fc_lport_state state;
70383diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
70384index de8e180..f15e0d7 100644
70385--- a/include/scsi/scsi_device.h
70386+++ b/include/scsi/scsi_device.h
70387@@ -156,9 +156,9 @@ struct scsi_device {
70388 unsigned int max_device_blocked; /* what device_blocked counts down from */
70389 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
70390
70391- atomic_t iorequest_cnt;
70392- atomic_t iodone_cnt;
70393- atomic_t ioerr_cnt;
70394+ atomic_unchecked_t iorequest_cnt;
70395+ atomic_unchecked_t iodone_cnt;
70396+ atomic_unchecked_t ioerr_cnt;
70397
70398 struct device sdev_gendev,
70399 sdev_dev;
70400diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
70401index fc50bd6..81ba9cb 100644
70402--- a/include/scsi/scsi_transport_fc.h
70403+++ b/include/scsi/scsi_transport_fc.h
70404@@ -708,7 +708,7 @@ struct fc_function_template {
70405 unsigned long show_host_system_hostname:1;
70406
70407 unsigned long disable_target_scan:1;
70408-};
70409+} __do_const;
70410
70411
70412 /**
70413diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
70414index 3dae3f7..8440d6f 100644
70415--- a/include/sound/ac97_codec.h
70416+++ b/include/sound/ac97_codec.h
70417@@ -419,15 +419,15 @@
70418 struct snd_ac97;
70419
70420 struct snd_ac97_build_ops {
70421- int (*build_3d) (struct snd_ac97 *ac97);
70422- int (*build_specific) (struct snd_ac97 *ac97);
70423- int (*build_spdif) (struct snd_ac97 *ac97);
70424- int (*build_post_spdif) (struct snd_ac97 *ac97);
70425+ int (* const build_3d) (struct snd_ac97 *ac97);
70426+ int (* const build_specific) (struct snd_ac97 *ac97);
70427+ int (* const build_spdif) (struct snd_ac97 *ac97);
70428+ int (* const build_post_spdif) (struct snd_ac97 *ac97);
70429 #ifdef CONFIG_PM
70430- void (*suspend) (struct snd_ac97 *ac97);
70431- void (*resume) (struct snd_ac97 *ac97);
70432+ void (* const suspend) (struct snd_ac97 *ac97);
70433+ void (* const resume) (struct snd_ac97 *ac97);
70434 #endif
70435- void (*update_jacks) (struct snd_ac97 *ac97); /* for jack-sharing */
70436+ void (* const update_jacks) (struct snd_ac97 *ac97); /* for jack-sharing */
70437 };
70438
70439 struct snd_ac97_bus_ops {
70440@@ -477,7 +477,7 @@ struct snd_ac97_template {
70441
70442 struct snd_ac97 {
70443 /* -- lowlevel (hardware) driver specific -- */
70444- struct snd_ac97_build_ops * build_ops;
70445+ const struct snd_ac97_build_ops * build_ops;
70446 void *private_data;
70447 void (*private_free) (struct snd_ac97 *ac97);
70448 /* --- */
70449diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
70450index 891cf1a..a94ba2b 100644
70451--- a/include/sound/ak4xxx-adda.h
70452+++ b/include/sound/ak4xxx-adda.h
70453@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
70454 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
70455 unsigned char val);
70456 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
70457-};
70458+} __no_const;
70459
70460 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
70461
70462diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
70463index 8c05e47..2b5df97 100644
70464--- a/include/sound/hwdep.h
70465+++ b/include/sound/hwdep.h
70466@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
70467 struct snd_hwdep_dsp_status *status);
70468 int (*dsp_load)(struct snd_hwdep *hw,
70469 struct snd_hwdep_dsp_image *image);
70470-};
70471+} __no_const;
70472
70473 struct snd_hwdep {
70474 struct snd_card *card;
70475diff --git a/include/sound/info.h b/include/sound/info.h
70476index 112e894..6fda5b5 100644
70477--- a/include/sound/info.h
70478+++ b/include/sound/info.h
70479@@ -44,7 +44,7 @@ struct snd_info_entry_text {
70480 struct snd_info_buffer *buffer);
70481 void (*write)(struct snd_info_entry *entry,
70482 struct snd_info_buffer *buffer);
70483-};
70484+} __no_const;
70485
70486 struct snd_info_entry_ops {
70487 int (*open)(struct snd_info_entry *entry,
70488diff --git a/include/sound/pcm.h b/include/sound/pcm.h
70489index de6d981..590a550 100644
70490--- a/include/sound/pcm.h
70491+++ b/include/sound/pcm.h
70492@@ -80,6 +80,7 @@ struct snd_pcm_ops {
70493 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
70494 int (*ack)(struct snd_pcm_substream *substream);
70495 };
70496+typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
70497
70498 /*
70499 *
70500diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
70501index 736eac7..fe8a80f 100644
70502--- a/include/sound/sb16_csp.h
70503+++ b/include/sound/sb16_csp.h
70504@@ -139,7 +139,7 @@ struct snd_sb_csp_ops {
70505 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
70506 int (*csp_stop) (struct snd_sb_csp * p);
70507 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
70508-};
70509+} __no_const;
70510
70511 /*
70512 * CSP private data
70513diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
70514index 444cd6b..3327cc5 100644
70515--- a/include/sound/ymfpci.h
70516+++ b/include/sound/ymfpci.h
70517@@ -358,7 +358,7 @@ struct snd_ymfpci {
70518 spinlock_t reg_lock;
70519 spinlock_t voice_lock;
70520 wait_queue_head_t interrupt_sleep;
70521- atomic_t interrupt_sleep_count;
70522+ atomic_unchecked_t interrupt_sleep_count;
70523 struct snd_info_entry *proc_entry;
70524 const struct firmware *dsp_microcode;
70525 const struct firmware *controller_microcode;
70526diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
70527index b89f9db..f097b38 100644
70528--- a/include/trace/events/irq.h
70529+++ b/include/trace/events/irq.h
70530@@ -34,7 +34,7 @@
70531 */
70532 TRACE_EVENT(irq_handler_entry,
70533
70534- TP_PROTO(int irq, struct irqaction *action),
70535+ TP_PROTO(int irq, const struct irqaction *action),
70536
70537 TP_ARGS(irq, action),
70538
70539@@ -64,7 +64,7 @@ TRACE_EVENT(irq_handler_entry,
70540 */
70541 TRACE_EVENT(irq_handler_exit,
70542
70543- TP_PROTO(int irq, struct irqaction *action, int ret),
70544+ TP_PROTO(int irq, const struct irqaction *action, int ret),
70545
70546 TP_ARGS(irq, action, ret),
70547
70548@@ -95,7 +95,7 @@ TRACE_EVENT(irq_handler_exit,
70549 */
70550 TRACE_EVENT(softirq_entry,
70551
70552- TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
70553+ TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
70554
70555 TP_ARGS(h, vec),
70556
70557@@ -124,7 +124,7 @@ TRACE_EVENT(softirq_entry,
70558 */
70559 TRACE_EVENT(softirq_exit,
70560
70561- TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
70562+ TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
70563
70564 TP_ARGS(h, vec),
70565
70566diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
70567index 0993a22..32ba2fe 100644
70568--- a/include/video/uvesafb.h
70569+++ b/include/video/uvesafb.h
70570@@ -177,6 +177,7 @@ struct uvesafb_par {
70571 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
70572 u8 pmi_setpal; /* PMI for palette changes */
70573 u16 *pmi_base; /* protected mode interface location */
70574+ u8 *pmi_code; /* protected mode code location */
70575 void *pmi_start;
70576 void *pmi_pal;
70577 u8 *vbe_state_orig; /*
70578diff --git a/init/Kconfig b/init/Kconfig
70579index d72691b..3996e54 100644
70580--- a/init/Kconfig
70581+++ b/init/Kconfig
70582@@ -1004,7 +1004,7 @@ config SLUB_DEBUG
70583
70584 config COMPAT_BRK
70585 bool "Disable heap randomization"
70586- default y
70587+ default n
70588 help
70589 Randomizing heap placement makes heap exploits harder, but it
70590 also breaks ancient binaries (including anything libc5 based).
70591diff --git a/init/do_mounts.c b/init/do_mounts.c
70592index bb008d0..4fa3933 100644
70593--- a/init/do_mounts.c
70594+++ b/init/do_mounts.c
70595@@ -216,11 +216,11 @@ static void __init get_fs_names(char *page)
70596
70597 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
70598 {
70599- int err = sys_mount(name, "/root", fs, flags, data);
70600+ int err = sys_mount((__force char __user *)name, (__force char __user *)"/root", (__force char __user *)fs, flags, (__force void __user *)data);
70601 if (err)
70602 return err;
70603
70604- sys_chdir("/root");
70605+ sys_chdir((__force const char __user *)"/root");
70606 ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
70607 printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
70608 current->fs->pwd.mnt->mnt_sb->s_type->name,
70609@@ -311,18 +311,18 @@ void __init change_floppy(char *fmt, ...)
70610 va_start(args, fmt);
70611 vsprintf(buf, fmt, args);
70612 va_end(args);
70613- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
70614+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
70615 if (fd >= 0) {
70616 sys_ioctl(fd, FDEJECT, 0);
70617 sys_close(fd);
70618 }
70619 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
70620- fd = sys_open("/dev/console", O_RDWR, 0);
70621+ fd = sys_open((char __user *)"/dev/console", O_RDWR, 0);
70622 if (fd >= 0) {
70623 sys_ioctl(fd, TCGETS, (long)&termios);
70624 termios.c_lflag &= ~ICANON;
70625 sys_ioctl(fd, TCSETSF, (long)&termios);
70626- sys_read(fd, &c, 1);
70627+ sys_read(fd, (char __user *)&c, 1);
70628 termios.c_lflag |= ICANON;
70629 sys_ioctl(fd, TCSETSF, (long)&termios);
70630 sys_close(fd);
70631@@ -416,6 +416,6 @@ void __init prepare_namespace(void)
70632 mount_root();
70633 out:
70634 devtmpfs_mount("dev");
70635- sys_mount(".", "/", NULL, MS_MOVE, NULL);
70636- sys_chroot(".");
70637+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
70638+ sys_chroot((__force char __user *)".");
70639 }
70640diff --git a/init/do_mounts.h b/init/do_mounts.h
70641index f5b978a..69dbfe8 100644
70642--- a/init/do_mounts.h
70643+++ b/init/do_mounts.h
70644@@ -15,15 +15,15 @@ extern int root_mountflags;
70645
70646 static inline int create_dev(char *name, dev_t dev)
70647 {
70648- sys_unlink(name);
70649- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
70650+ sys_unlink((char __force_user *)name);
70651+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
70652 }
70653
70654 #if BITS_PER_LONG == 32
70655 static inline u32 bstat(char *name)
70656 {
70657 struct stat64 stat;
70658- if (sys_stat64(name, &stat) != 0)
70659+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
70660 return 0;
70661 if (!S_ISBLK(stat.st_mode))
70662 return 0;
70663@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
70664 static inline u32 bstat(char *name)
70665 {
70666 struct stat stat;
70667- if (sys_newstat(name, &stat) != 0)
70668+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
70669 return 0;
70670 if (!S_ISBLK(stat.st_mode))
70671 return 0;
70672diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
70673index 614241b..4da046b 100644
70674--- a/init/do_mounts_initrd.c
70675+++ b/init/do_mounts_initrd.c
70676@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shell)
70677 sys_close(old_fd);sys_close(root_fd);
70678 sys_close(0);sys_close(1);sys_close(2);
70679 sys_setsid();
70680- (void) sys_open("/dev/console",O_RDWR,0);
70681+ (void) sys_open((__force const char __user *)"/dev/console",O_RDWR,0);
70682 (void) sys_dup(0);
70683 (void) sys_dup(0);
70684 return kernel_execve(shell, argv, envp_init);
70685@@ -47,13 +47,13 @@ static void __init handle_initrd(void)
70686 create_dev("/dev/root.old", Root_RAM0);
70687 /* mount initrd on rootfs' /root */
70688 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
70689- sys_mkdir("/old", 0700);
70690- root_fd = sys_open("/", 0, 0);
70691- old_fd = sys_open("/old", 0, 0);
70692+ sys_mkdir((const char __force_user *)"/old", 0700);
70693+ root_fd = sys_open((const char __force_user *)"/", 0, 0);
70694+ old_fd = sys_open((const char __force_user *)"/old", 0, 0);
70695 /* move initrd over / and chdir/chroot in initrd root */
70696- sys_chdir("/root");
70697- sys_mount(".", "/", NULL, MS_MOVE, NULL);
70698- sys_chroot(".");
70699+ sys_chdir((const char __force_user *)"/root");
70700+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
70701+ sys_chroot((const char __force_user *)".");
70702
70703 /*
70704 * In case that a resume from disk is carried out by linuxrc or one of
70705@@ -70,15 +70,15 @@ static void __init handle_initrd(void)
70706
70707 /* move initrd to rootfs' /old */
70708 sys_fchdir(old_fd);
70709- sys_mount("/", ".", NULL, MS_MOVE, NULL);
70710+ sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
70711 /* switch root and cwd back to / of rootfs */
70712 sys_fchdir(root_fd);
70713- sys_chroot(".");
70714+ sys_chroot((const char __force_user *)".");
70715 sys_close(old_fd);
70716 sys_close(root_fd);
70717
70718 if (new_decode_dev(real_root_dev) == Root_RAM0) {
70719- sys_chdir("/old");
70720+ sys_chdir((const char __force_user *)"/old");
70721 return;
70722 }
70723
70724@@ -86,17 +86,17 @@ static void __init handle_initrd(void)
70725 mount_root();
70726
70727 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
70728- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
70729+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
70730 if (!error)
70731 printk("okay\n");
70732 else {
70733- int fd = sys_open("/dev/root.old", O_RDWR, 0);
70734+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
70735 if (error == -ENOENT)
70736 printk("/initrd does not exist. Ignored.\n");
70737 else
70738 printk("failed\n");
70739 printk(KERN_NOTICE "Unmounting old root\n");
70740- sys_umount("/old", MNT_DETACH);
70741+ sys_umount((char __force_user *)"/old", MNT_DETACH);
70742 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
70743 if (fd < 0) {
70744 error = fd;
70745@@ -119,11 +119,11 @@ int __init initrd_load(void)
70746 * mounted in the normal path.
70747 */
70748 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
70749- sys_unlink("/initrd.image");
70750+ sys_unlink((const char __force_user *)"/initrd.image");
70751 handle_initrd();
70752 return 1;
70753 }
70754 }
70755- sys_unlink("/initrd.image");
70756+ sys_unlink((const char __force_user *)"/initrd.image");
70757 return 0;
70758 }
70759diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
70760index 69aebbf..c0bf6a7 100644
70761--- a/init/do_mounts_md.c
70762+++ b/init/do_mounts_md.c
70763@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
70764 partitioned ? "_d" : "", minor,
70765 md_setup_args[ent].device_names);
70766
70767- fd = sys_open(name, 0, 0);
70768+ fd = sys_open((char __force_user *)name, 0, 0);
70769 if (fd < 0) {
70770 printk(KERN_ERR "md: open failed - cannot start "
70771 "array %s\n", name);
70772@@ -233,7 +233,7 @@ static void __init md_setup_drive(void)
70773 * array without it
70774 */
70775 sys_close(fd);
70776- fd = sys_open(name, 0, 0);
70777+ fd = sys_open((char __force_user *)name, 0, 0);
70778 sys_ioctl(fd, BLKRRPART, 0);
70779 }
70780 sys_close(fd);
70781@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
70782
70783 wait_for_device_probe();
70784
70785- fd = sys_open("/dev/md0", 0, 0);
70786+ fd = sys_open((__force char __user *)"/dev/md0", 0, 0);
70787 if (fd >= 0) {
70788 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
70789 sys_close(fd);
70790diff --git a/init/initramfs.c b/init/initramfs.c
70791index 1fd59b8..a01b079 100644
70792--- a/init/initramfs.c
70793+++ b/init/initramfs.c
70794@@ -74,7 +74,7 @@ static void __init free_hash(void)
70795 }
70796 }
70797
70798-static long __init do_utime(char __user *filename, time_t mtime)
70799+static long __init do_utime(__force char __user *filename, time_t mtime)
70800 {
70801 struct timespec t[2];
70802
70803@@ -109,7 +109,7 @@ static void __init dir_utime(void)
70804 struct dir_entry *de, *tmp;
70805 list_for_each_entry_safe(de, tmp, &dir_list, list) {
70806 list_del(&de->list);
70807- do_utime(de->name, de->mtime);
70808+ do_utime((char __force_user *)de->name, de->mtime);
70809 kfree(de->name);
70810 kfree(de);
70811 }
70812@@ -271,7 +271,7 @@ static int __init maybe_link(void)
70813 if (nlink >= 2) {
70814 char *old = find_link(major, minor, ino, mode, collected);
70815 if (old)
70816- return (sys_link(old, collected) < 0) ? -1 : 1;
70817+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
70818 }
70819 return 0;
70820 }
70821@@ -280,11 +280,11 @@ static void __init clean_path(char *path, mode_t mode)
70822 {
70823 struct stat st;
70824
70825- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
70826+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
70827 if (S_ISDIR(st.st_mode))
70828- sys_rmdir(path);
70829+ sys_rmdir((char __force_user *)path);
70830 else
70831- sys_unlink(path);
70832+ sys_unlink((char __force_user *)path);
70833 }
70834 }
70835
70836@@ -305,7 +305,7 @@ static int __init do_name(void)
70837 int openflags = O_WRONLY|O_CREAT;
70838 if (ml != 1)
70839 openflags |= O_TRUNC;
70840- wfd = sys_open(collected, openflags, mode);
70841+ wfd = sys_open((char __force_user *)collected, openflags, mode);
70842
70843 if (wfd >= 0) {
70844 sys_fchown(wfd, uid, gid);
70845@@ -317,17 +317,17 @@ static int __init do_name(void)
70846 }
70847 }
70848 } else if (S_ISDIR(mode)) {
70849- sys_mkdir(collected, mode);
70850- sys_chown(collected, uid, gid);
70851- sys_chmod(collected, mode);
70852+ sys_mkdir((char __force_user *)collected, mode);
70853+ sys_chown((char __force_user *)collected, uid, gid);
70854+ sys_chmod((char __force_user *)collected, mode);
70855 dir_add(collected, mtime);
70856 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
70857 S_ISFIFO(mode) || S_ISSOCK(mode)) {
70858 if (maybe_link() == 0) {
70859- sys_mknod(collected, mode, rdev);
70860- sys_chown(collected, uid, gid);
70861- sys_chmod(collected, mode);
70862- do_utime(collected, mtime);
70863+ sys_mknod((char __force_user *)collected, mode, rdev);
70864+ sys_chown((char __force_user *)collected, uid, gid);
70865+ sys_chmod((char __force_user *)collected, mode);
70866+ do_utime((char __force_user *)collected, mtime);
70867 }
70868 }
70869 return 0;
70870@@ -336,15 +336,15 @@ static int __init do_name(void)
70871 static int __init do_copy(void)
70872 {
70873 if (count >= body_len) {
70874- sys_write(wfd, victim, body_len);
70875+ sys_write(wfd, (char __force_user *)victim, body_len);
70876 sys_close(wfd);
70877- do_utime(vcollected, mtime);
70878+ do_utime((char __force_user *)vcollected, mtime);
70879 kfree(vcollected);
70880 eat(body_len);
70881 state = SkipIt;
70882 return 0;
70883 } else {
70884- sys_write(wfd, victim, count);
70885+ sys_write(wfd, (char __force_user *)victim, count);
70886 body_len -= count;
70887 eat(count);
70888 return 1;
70889@@ -355,9 +355,9 @@ static int __init do_symlink(void)
70890 {
70891 collected[N_ALIGN(name_len) + body_len] = '\0';
70892 clean_path(collected, 0);
70893- sys_symlink(collected + N_ALIGN(name_len), collected);
70894- sys_lchown(collected, uid, gid);
70895- do_utime(collected, mtime);
70896+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
70897+ sys_lchown((char __force_user *)collected, uid, gid);
70898+ do_utime((char __force_user *)collected, mtime);
70899 state = SkipIt;
70900 next_state = Reset;
70901 return 0;
70902diff --git a/init/main.c b/init/main.c
70903index 1eb4bd5..fea5bbe 100644
70904--- a/init/main.c
70905+++ b/init/main.c
70906@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) { }
70907 #ifdef CONFIG_TC
70908 extern void tc_init(void);
70909 #endif
70910+extern void grsecurity_init(void);
70911
70912 enum system_states system_state __read_mostly;
70913 EXPORT_SYMBOL(system_state);
70914@@ -183,6 +184,49 @@ static int __init set_reset_devices(char *str)
70915
70916 __setup("reset_devices", set_reset_devices);
70917
70918+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
70919+extern char pax_enter_kernel_user[];
70920+extern char pax_exit_kernel_user[];
70921+extern pgdval_t clone_pgd_mask;
70922+#endif
70923+
70924+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
70925+static int __init setup_pax_nouderef(char *str)
70926+{
70927+#ifdef CONFIG_X86_32
70928+ unsigned int cpu;
70929+ struct desc_struct *gdt;
70930+
70931+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
70932+ gdt = get_cpu_gdt_table(cpu);
70933+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
70934+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
70935+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
70936+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
70937+ }
70938+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
70939+#else
70940+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
70941+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
70942+ clone_pgd_mask = ~(pgdval_t)0UL;
70943+#endif
70944+
70945+ return 0;
70946+}
70947+early_param("pax_nouderef", setup_pax_nouderef);
70948+#endif
70949+
70950+#ifdef CONFIG_PAX_SOFTMODE
70951+int pax_softmode;
70952+
70953+static int __init setup_pax_softmode(char *str)
70954+{
70955+ get_option(&str, &pax_softmode);
70956+ return 1;
70957+}
70958+__setup("pax_softmode=", setup_pax_softmode);
70959+#endif
70960+
70961 static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
70962 char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
70963 static const char *panic_later, *panic_param;
70964@@ -705,52 +749,53 @@ int initcall_debug;
70965 core_param(initcall_debug, initcall_debug, bool, 0644);
70966
70967 static char msgbuf[64];
70968-static struct boot_trace_call call;
70969-static struct boot_trace_ret ret;
70970+static struct boot_trace_call trace_call;
70971+static struct boot_trace_ret trace_ret;
70972
70973 int do_one_initcall(initcall_t fn)
70974 {
70975 int count = preempt_count();
70976 ktime_t calltime, delta, rettime;
70977+ const char *msg1 = "", *msg2 = "";
70978
70979 if (initcall_debug) {
70980- call.caller = task_pid_nr(current);
70981- printk("calling %pF @ %i\n", fn, call.caller);
70982+ trace_call.caller = task_pid_nr(current);
70983+ printk("calling %pF @ %i\n", fn, trace_call.caller);
70984 calltime = ktime_get();
70985- trace_boot_call(&call, fn);
70986+ trace_boot_call(&trace_call, fn);
70987 enable_boot_trace();
70988 }
70989
70990- ret.result = fn();
70991+ trace_ret.result = fn();
70992
70993 if (initcall_debug) {
70994 disable_boot_trace();
70995 rettime = ktime_get();
70996 delta = ktime_sub(rettime, calltime);
70997- ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
70998- trace_boot_ret(&ret, fn);
70999+ trace_ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
71000+ trace_boot_ret(&trace_ret, fn);
71001 printk("initcall %pF returned %d after %Ld usecs\n", fn,
71002- ret.result, ret.duration);
71003+ trace_ret.result, trace_ret.duration);
71004 }
71005
71006 msgbuf[0] = 0;
71007
71008- if (ret.result && ret.result != -ENODEV && initcall_debug)
71009- sprintf(msgbuf, "error code %d ", ret.result);
71010+ if (trace_ret.result && trace_ret.result != -ENODEV && initcall_debug)
71011+ sprintf(msgbuf, "error code %d ", trace_ret.result);
71012
71013 if (preempt_count() != count) {
71014- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
71015+ msg1 = " preemption imbalance";
71016 preempt_count() = count;
71017 }
71018 if (irqs_disabled()) {
71019- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
71020+ msg2 = " disabled interrupts";
71021 local_irq_enable();
71022 }
71023- if (msgbuf[0]) {
71024- printk("initcall %pF returned with %s\n", fn, msgbuf);
71025+ if (msgbuf[0] || *msg1 || *msg2) {
71026+ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
71027 }
71028
71029- return ret.result;
71030+ return trace_ret.result;
71031 }
71032
71033
71034@@ -893,11 +938,13 @@ static int __init kernel_init(void * unused)
71035 if (!ramdisk_execute_command)
71036 ramdisk_execute_command = "/init";
71037
71038- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
71039+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
71040 ramdisk_execute_command = NULL;
71041 prepare_namespace();
71042 }
71043
71044+ grsecurity_init();
71045+
71046 /*
71047 * Ok, we have completed the initial bootup, and
71048 * we're essentially up and running. Get rid of the
71049diff --git a/init/noinitramfs.c b/init/noinitramfs.c
71050index f4c1a3a..96c19bd 100644
71051--- a/init/noinitramfs.c
71052+++ b/init/noinitramfs.c
71053@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
71054 {
71055 int err;
71056
71057- err = sys_mkdir("/dev", 0755);
71058+ err = sys_mkdir((const char __user *)"/dev", 0755);
71059 if (err < 0)
71060 goto out;
71061
71062@@ -39,7 +39,7 @@ static int __init default_rootfs(void)
71063 if (err < 0)
71064 goto out;
71065
71066- err = sys_mkdir("/root", 0700);
71067+ err = sys_mkdir((const char __user *)"/root", 0700);
71068 if (err < 0)
71069 goto out;
71070
71071diff --git a/ipc/mqueue.c b/ipc/mqueue.c
71072index d01bc14..8df81db 100644
71073--- a/ipc/mqueue.c
71074+++ b/ipc/mqueue.c
71075@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
71076 mq_bytes = (mq_msg_tblsz +
71077 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
71078
71079+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
71080 spin_lock(&mq_lock);
71081 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
71082 u->mq_bytes + mq_bytes >
71083diff --git a/ipc/msg.c b/ipc/msg.c
71084index 779f762..4af9e36 100644
71085--- a/ipc/msg.c
71086+++ b/ipc/msg.c
71087@@ -310,18 +310,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
71088 return security_msg_queue_associate(msq, msgflg);
71089 }
71090
71091+static struct ipc_ops msg_ops = {
71092+ .getnew = newque,
71093+ .associate = msg_security,
71094+ .more_checks = NULL
71095+};
71096+
71097 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
71098 {
71099 struct ipc_namespace *ns;
71100- struct ipc_ops msg_ops;
71101 struct ipc_params msg_params;
71102
71103 ns = current->nsproxy->ipc_ns;
71104
71105- msg_ops.getnew = newque;
71106- msg_ops.associate = msg_security;
71107- msg_ops.more_checks = NULL;
71108-
71109 msg_params.key = key;
71110 msg_params.flg = msgflg;
71111
71112diff --git a/ipc/sem.c b/ipc/sem.c
71113index b781007..f738b04 100644
71114--- a/ipc/sem.c
71115+++ b/ipc/sem.c
71116@@ -309,10 +309,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
71117 return 0;
71118 }
71119
71120+static struct ipc_ops sem_ops = {
71121+ .getnew = newary,
71122+ .associate = sem_security,
71123+ .more_checks = sem_more_checks
71124+};
71125+
71126 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
71127 {
71128 struct ipc_namespace *ns;
71129- struct ipc_ops sem_ops;
71130 struct ipc_params sem_params;
71131
71132 ns = current->nsproxy->ipc_ns;
71133@@ -320,10 +325,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
71134 if (nsems < 0 || nsems > ns->sc_semmsl)
71135 return -EINVAL;
71136
71137- sem_ops.getnew = newary;
71138- sem_ops.associate = sem_security;
71139- sem_ops.more_checks = sem_more_checks;
71140-
71141 sem_params.key = key;
71142 sem_params.flg = semflg;
71143 sem_params.u.nsems = nsems;
71144@@ -671,6 +672,8 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
71145 ushort* sem_io = fast_sem_io;
71146 int nsems;
71147
71148+ pax_track_stack();
71149+
71150 sma = sem_lock_check(ns, semid);
71151 if (IS_ERR(sma))
71152 return PTR_ERR(sma);
71153@@ -1071,6 +1074,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
71154 unsigned long jiffies_left = 0;
71155 struct ipc_namespace *ns;
71156
71157+ pax_track_stack();
71158+
71159 ns = current->nsproxy->ipc_ns;
71160
71161 if (nsops < 1 || semid < 0)
71162diff --git a/ipc/shm.c b/ipc/shm.c
71163index d30732c..e4992cd 100644
71164--- a/ipc/shm.c
71165+++ b/ipc/shm.c
71166@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
71167 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
71168 #endif
71169
71170+#ifdef CONFIG_GRKERNSEC
71171+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
71172+ const time_t shm_createtime, const uid_t cuid,
71173+ const int shmid);
71174+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
71175+ const time_t shm_createtime);
71176+#endif
71177+
71178 void shm_init_ns(struct ipc_namespace *ns)
71179 {
71180 ns->shm_ctlmax = SHMMAX;
71181@@ -396,6 +404,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
71182 shp->shm_lprid = 0;
71183 shp->shm_atim = shp->shm_dtim = 0;
71184 shp->shm_ctim = get_seconds();
71185+#ifdef CONFIG_GRKERNSEC
71186+ {
71187+ struct timespec timeval;
71188+ do_posix_clock_monotonic_gettime(&timeval);
71189+
71190+ shp->shm_createtime = timeval.tv_sec;
71191+ }
71192+#endif
71193 shp->shm_segsz = size;
71194 shp->shm_nattch = 0;
71195 shp->shm_file = file;
71196@@ -446,18 +462,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
71197 return 0;
71198 }
71199
71200+static struct ipc_ops shm_ops = {
71201+ .getnew = newseg,
71202+ .associate = shm_security,
71203+ .more_checks = shm_more_checks
71204+};
71205+
71206 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
71207 {
71208 struct ipc_namespace *ns;
71209- struct ipc_ops shm_ops;
71210 struct ipc_params shm_params;
71211
71212 ns = current->nsproxy->ipc_ns;
71213
71214- shm_ops.getnew = newseg;
71215- shm_ops.associate = shm_security;
71216- shm_ops.more_checks = shm_more_checks;
71217-
71218 shm_params.key = key;
71219 shm_params.flg = shmflg;
71220 shm_params.u.size = size;
71221@@ -857,6 +874,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
71222 f_mode = FMODE_READ | FMODE_WRITE;
71223 }
71224 if (shmflg & SHM_EXEC) {
71225+
71226+#ifdef CONFIG_PAX_MPROTECT
71227+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
71228+ goto out;
71229+#endif
71230+
71231 prot |= PROT_EXEC;
71232 acc_mode |= S_IXUGO;
71233 }
71234@@ -880,9 +903,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
71235 if (err)
71236 goto out_unlock;
71237
71238+#ifdef CONFIG_GRKERNSEC
71239+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
71240+ shp->shm_perm.cuid, shmid) ||
71241+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
71242+ err = -EACCES;
71243+ goto out_unlock;
71244+ }
71245+#endif
71246+
71247 path.dentry = dget(shp->shm_file->f_path.dentry);
71248 path.mnt = shp->shm_file->f_path.mnt;
71249 shp->shm_nattch++;
71250+#ifdef CONFIG_GRKERNSEC
71251+ shp->shm_lapid = current->pid;
71252+#endif
71253 size = i_size_read(path.dentry->d_inode);
71254 shm_unlock(shp);
71255
71256diff --git a/kernel/acct.c b/kernel/acct.c
71257index a6605ca..ca91111 100644
71258--- a/kernel/acct.c
71259+++ b/kernel/acct.c
71260@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
71261 */
71262 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
71263 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
71264- file->f_op->write(file, (char *)&ac,
71265+ file->f_op->write(file, (char __force_user *)&ac,
71266 sizeof(acct_t), &file->f_pos);
71267 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
71268 set_fs(fs);
71269diff --git a/kernel/audit.c b/kernel/audit.c
71270index 5feed23..48415fd 100644
71271--- a/kernel/audit.c
71272+++ b/kernel/audit.c
71273@@ -110,7 +110,7 @@ u32 audit_sig_sid = 0;
71274 3) suppressed due to audit_rate_limit
71275 4) suppressed due to audit_backlog_limit
71276 */
71277-static atomic_t audit_lost = ATOMIC_INIT(0);
71278+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
71279
71280 /* The netlink socket. */
71281 static struct sock *audit_sock;
71282@@ -232,7 +232,7 @@ void audit_log_lost(const char *message)
71283 unsigned long now;
71284 int print;
71285
71286- atomic_inc(&audit_lost);
71287+ atomic_inc_unchecked(&audit_lost);
71288
71289 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
71290
71291@@ -251,7 +251,7 @@ void audit_log_lost(const char *message)
71292 printk(KERN_WARNING
71293 "audit: audit_lost=%d audit_rate_limit=%d "
71294 "audit_backlog_limit=%d\n",
71295- atomic_read(&audit_lost),
71296+ atomic_read_unchecked(&audit_lost),
71297 audit_rate_limit,
71298 audit_backlog_limit);
71299 audit_panic(message);
71300@@ -691,7 +691,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
71301 status_set.pid = audit_pid;
71302 status_set.rate_limit = audit_rate_limit;
71303 status_set.backlog_limit = audit_backlog_limit;
71304- status_set.lost = atomic_read(&audit_lost);
71305+ status_set.lost = atomic_read_unchecked(&audit_lost);
71306 status_set.backlog = skb_queue_len(&audit_skb_queue);
71307 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
71308 &status_set, sizeof(status_set));
71309@@ -891,8 +891,10 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
71310 spin_unlock_irq(&tsk->sighand->siglock);
71311 }
71312 read_unlock(&tasklist_lock);
71313- audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_TTY_GET, 0, 0,
71314- &s, sizeof(s));
71315+
71316+ if (!err)
71317+ audit_send_reply(NETLINK_CB(skb).pid, seq,
71318+ AUDIT_TTY_GET, 0, 0, &s, sizeof(s));
71319 break;
71320 }
71321 case AUDIT_TTY_SET: {
71322@@ -1262,12 +1264,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
71323 avail = audit_expand(ab,
71324 max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
71325 if (!avail)
71326- goto out;
71327+ goto out_va_end;
71328 len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2);
71329 }
71330- va_end(args2);
71331 if (len > 0)
71332 skb_put(skb, len);
71333+out_va_end:
71334+ va_end(args2);
71335 out:
71336 return;
71337 }
71338diff --git a/kernel/auditsc.c b/kernel/auditsc.c
71339index 267e484..ac41bc3 100644
71340--- a/kernel/auditsc.c
71341+++ b/kernel/auditsc.c
71342@@ -1157,8 +1157,8 @@ static void audit_log_execve_info(struct audit_context *context,
71343 struct audit_buffer **ab,
71344 struct audit_aux_data_execve *axi)
71345 {
71346- int i;
71347- size_t len, len_sent = 0;
71348+ int i, len;
71349+ size_t len_sent = 0;
71350 const char __user *p;
71351 char *buf;
71352
71353@@ -2113,7 +2113,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
71354 }
71355
71356 /* global counter which is incremented every time something logs in */
71357-static atomic_t session_id = ATOMIC_INIT(0);
71358+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
71359
71360 /**
71361 * audit_set_loginuid - set a task's audit_context loginuid
71362@@ -2126,7 +2126,7 @@ static atomic_t session_id = ATOMIC_INIT(0);
71363 */
71364 int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
71365 {
71366- unsigned int sessionid = atomic_inc_return(&session_id);
71367+ unsigned int sessionid = atomic_inc_return_unchecked(&session_id);
71368 struct audit_context *context = task->audit_context;
71369
71370 if (context && context->in_syscall) {
71371diff --git a/kernel/capability.c b/kernel/capability.c
71372index 8a944f5..db5001e 100644
71373--- a/kernel/capability.c
71374+++ b/kernel/capability.c
71375@@ -305,10 +305,26 @@ int capable(int cap)
71376 BUG();
71377 }
71378
71379- if (security_capable(cap) == 0) {
71380+ if (security_capable(cap) == 0 && gr_is_capable(cap)) {
71381 current->flags |= PF_SUPERPRIV;
71382 return 1;
71383 }
71384 return 0;
71385 }
71386+
71387+int capable_nolog(int cap)
71388+{
71389+ if (unlikely(!cap_valid(cap))) {
71390+ printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
71391+ BUG();
71392+ }
71393+
71394+ if (security_capable(cap) == 0 && gr_is_capable_nolog(cap)) {
71395+ current->flags |= PF_SUPERPRIV;
71396+ return 1;
71397+ }
71398+ return 0;
71399+}
71400+
71401 EXPORT_SYMBOL(capable);
71402+EXPORT_SYMBOL(capable_nolog);
71403diff --git a/kernel/cgroup.c b/kernel/cgroup.c
71404index 1fbcc74..7000012 100644
71405--- a/kernel/cgroup.c
71406+++ b/kernel/cgroup.c
71407@@ -536,6 +536,8 @@ static struct css_set *find_css_set(
71408 struct hlist_head *hhead;
71409 struct cg_cgroup_link *link;
71410
71411+ pax_track_stack();
71412+
71413 /* First see if we already have a cgroup group that matches
71414 * the desired set */
71415 read_lock(&css_set_lock);
71416diff --git a/kernel/compat.c b/kernel/compat.c
71417index 8bc5578..186e44a 100644
71418--- a/kernel/compat.c
71419+++ b/kernel/compat.c
71420@@ -108,7 +108,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
71421 mm_segment_t oldfs;
71422 long ret;
71423
71424- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
71425+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
71426 oldfs = get_fs();
71427 set_fs(KERNEL_DS);
71428 ret = hrtimer_nanosleep_restart(restart);
71429@@ -140,7 +140,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
71430 oldfs = get_fs();
71431 set_fs(KERNEL_DS);
71432 ret = hrtimer_nanosleep(&tu,
71433- rmtp ? (struct timespec __user *)&rmt : NULL,
71434+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
71435 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
71436 set_fs(oldfs);
71437
71438@@ -247,7 +247,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
71439 mm_segment_t old_fs = get_fs();
71440
71441 set_fs(KERNEL_DS);
71442- ret = sys_sigpending((old_sigset_t __user *) &s);
71443+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
71444 set_fs(old_fs);
71445 if (ret == 0)
71446 ret = put_user(s, set);
71447@@ -266,8 +266,8 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set,
71448 old_fs = get_fs();
71449 set_fs(KERNEL_DS);
71450 ret = sys_sigprocmask(how,
71451- set ? (old_sigset_t __user *) &s : NULL,
71452- oset ? (old_sigset_t __user *) &s : NULL);
71453+ set ? (old_sigset_t __force_user *) &s : NULL,
71454+ oset ? (old_sigset_t __force_user *) &s : NULL);
71455 set_fs(old_fs);
71456 if (ret == 0)
71457 if (oset)
71458@@ -310,7 +310,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
71459 mm_segment_t old_fs = get_fs();
71460
71461 set_fs(KERNEL_DS);
71462- ret = sys_old_getrlimit(resource, &r);
71463+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
71464 set_fs(old_fs);
71465
71466 if (!ret) {
71467@@ -385,7 +385,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
71468 mm_segment_t old_fs = get_fs();
71469
71470 set_fs(KERNEL_DS);
71471- ret = sys_getrusage(who, (struct rusage __user *) &r);
71472+ ret = sys_getrusage(who, (struct rusage __force_user *) &r);
71473 set_fs(old_fs);
71474
71475 if (ret)
71476@@ -412,8 +412,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
71477 set_fs (KERNEL_DS);
71478 ret = sys_wait4(pid,
71479 (stat_addr ?
71480- (unsigned int __user *) &status : NULL),
71481- options, (struct rusage __user *) &r);
71482+ (unsigned int __force_user *) &status : NULL),
71483+ options, (struct rusage __force_user *) &r);
71484 set_fs (old_fs);
71485
71486 if (ret > 0) {
71487@@ -438,8 +438,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
71488 memset(&info, 0, sizeof(info));
71489
71490 set_fs(KERNEL_DS);
71491- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
71492- uru ? (struct rusage __user *)&ru : NULL);
71493+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
71494+ uru ? (struct rusage __force_user *)&ru : NULL);
71495 set_fs(old_fs);
71496
71497 if ((ret < 0) || (info.si_signo == 0))
71498@@ -569,8 +569,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
71499 oldfs = get_fs();
71500 set_fs(KERNEL_DS);
71501 err = sys_timer_settime(timer_id, flags,
71502- (struct itimerspec __user *) &newts,
71503- (struct itimerspec __user *) &oldts);
71504+ (struct itimerspec __force_user *) &newts,
71505+ (struct itimerspec __force_user *) &oldts);
71506 set_fs(oldfs);
71507 if (!err && old && put_compat_itimerspec(old, &oldts))
71508 return -EFAULT;
71509@@ -587,7 +587,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
71510 oldfs = get_fs();
71511 set_fs(KERNEL_DS);
71512 err = sys_timer_gettime(timer_id,
71513- (struct itimerspec __user *) &ts);
71514+ (struct itimerspec __force_user *) &ts);
71515 set_fs(oldfs);
71516 if (!err && put_compat_itimerspec(setting, &ts))
71517 return -EFAULT;
71518@@ -606,7 +606,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
71519 oldfs = get_fs();
71520 set_fs(KERNEL_DS);
71521 err = sys_clock_settime(which_clock,
71522- (struct timespec __user *) &ts);
71523+ (struct timespec __force_user *) &ts);
71524 set_fs(oldfs);
71525 return err;
71526 }
71527@@ -621,7 +621,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
71528 oldfs = get_fs();
71529 set_fs(KERNEL_DS);
71530 err = sys_clock_gettime(which_clock,
71531- (struct timespec __user *) &ts);
71532+ (struct timespec __force_user *) &ts);
71533 set_fs(oldfs);
71534 if (!err && put_compat_timespec(&ts, tp))
71535 return -EFAULT;
71536@@ -638,7 +638,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
71537 oldfs = get_fs();
71538 set_fs(KERNEL_DS);
71539 err = sys_clock_getres(which_clock,
71540- (struct timespec __user *) &ts);
71541+ (struct timespec __force_user *) &ts);
71542 set_fs(oldfs);
71543 if (!err && tp && put_compat_timespec(&ts, tp))
71544 return -EFAULT;
71545@@ -650,9 +650,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
71546 long err;
71547 mm_segment_t oldfs;
71548 struct timespec tu;
71549- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
71550+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
71551
71552- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
71553+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
71554 oldfs = get_fs();
71555 set_fs(KERNEL_DS);
71556 err = clock_nanosleep_restart(restart);
71557@@ -684,8 +684,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
71558 oldfs = get_fs();
71559 set_fs(KERNEL_DS);
71560 err = sys_clock_nanosleep(which_clock, flags,
71561- (struct timespec __user *) &in,
71562- (struct timespec __user *) &out);
71563+ (struct timespec __force_user *) &in,
71564+ (struct timespec __force_user *) &out);
71565 set_fs(oldfs);
71566
71567 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
71568diff --git a/kernel/configs.c b/kernel/configs.c
71569index abaee68..047facd 100644
71570--- a/kernel/configs.c
71571+++ b/kernel/configs.c
71572@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
71573 struct proc_dir_entry *entry;
71574
71575 /* create the current config file */
71576+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
71577+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
71578+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
71579+ &ikconfig_file_ops);
71580+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71581+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
71582+ &ikconfig_file_ops);
71583+#endif
71584+#else
71585 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
71586 &ikconfig_file_ops);
71587+#endif
71588+
71589 if (!entry)
71590 return -ENOMEM;
71591
71592diff --git a/kernel/cpu.c b/kernel/cpu.c
71593index 3f2f04f..4e53ded 100644
71594--- a/kernel/cpu.c
71595+++ b/kernel/cpu.c
71596@@ -20,7 +20,7 @@
71597 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
71598 static DEFINE_MUTEX(cpu_add_remove_lock);
71599
71600-static __cpuinitdata RAW_NOTIFIER_HEAD(cpu_chain);
71601+static RAW_NOTIFIER_HEAD(cpu_chain);
71602
71603 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
71604 * Should always be manipulated under cpu_add_remove_lock
71605diff --git a/kernel/cred.c b/kernel/cred.c
71606index 0b5b5fc..f7fe51a 100644
71607--- a/kernel/cred.c
71608+++ b/kernel/cred.c
71609@@ -160,6 +160,8 @@ static void put_cred_rcu(struct rcu_head *rcu)
71610 */
71611 void __put_cred(struct cred *cred)
71612 {
71613+ pax_track_stack();
71614+
71615 kdebug("__put_cred(%p{%d,%d})", cred,
71616 atomic_read(&cred->usage),
71617 read_cred_subscribers(cred));
71618@@ -184,6 +186,8 @@ void exit_creds(struct task_struct *tsk)
71619 {
71620 struct cred *cred;
71621
71622+ pax_track_stack();
71623+
71624 kdebug("exit_creds(%u,%p,%p,{%d,%d})", tsk->pid, tsk->real_cred, tsk->cred,
71625 atomic_read(&tsk->cred->usage),
71626 read_cred_subscribers(tsk->cred));
71627@@ -206,6 +210,15 @@ void exit_creds(struct task_struct *tsk)
71628 validate_creds(cred);
71629 put_cred(cred);
71630 }
71631+
71632+#ifdef CONFIG_GRKERNSEC_SETXID
71633+ cred = (struct cred *) tsk->delayed_cred;
71634+ if (cred) {
71635+ tsk->delayed_cred = NULL;
71636+ validate_creds(cred);
71637+ put_cred(cred);
71638+ }
71639+#endif
71640 }
71641
71642 /**
71643@@ -222,6 +235,8 @@ const struct cred *get_task_cred(struct task_struct *task)
71644 {
71645 const struct cred *cred;
71646
71647+ pax_track_stack();
71648+
71649 rcu_read_lock();
71650
71651 do {
71652@@ -241,6 +256,8 @@ struct cred *cred_alloc_blank(void)
71653 {
71654 struct cred *new;
71655
71656+ pax_track_stack();
71657+
71658 new = kmem_cache_zalloc(cred_jar, GFP_KERNEL);
71659 if (!new)
71660 return NULL;
71661@@ -289,6 +306,8 @@ struct cred *prepare_creds(void)
71662 const struct cred *old;
71663 struct cred *new;
71664
71665+ pax_track_stack();
71666+
71667 validate_process_creds();
71668
71669 new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
71670@@ -335,6 +354,8 @@ struct cred *prepare_exec_creds(void)
71671 struct thread_group_cred *tgcred = NULL;
71672 struct cred *new;
71673
71674+ pax_track_stack();
71675+
71676 #ifdef CONFIG_KEYS
71677 tgcred = kmalloc(sizeof(*tgcred), GFP_KERNEL);
71678 if (!tgcred)
71679@@ -441,6 +462,8 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags)
71680 struct cred *new;
71681 int ret;
71682
71683+ pax_track_stack();
71684+
71685 mutex_init(&p->cred_guard_mutex);
71686
71687 if (
71688@@ -523,11 +546,13 @@ error_put:
71689 * Always returns 0 thus allowing this function to be tail-called at the end
71690 * of, say, sys_setgid().
71691 */
71692-int commit_creds(struct cred *new)
71693+static int __commit_creds(struct cred *new)
71694 {
71695 struct task_struct *task = current;
71696 const struct cred *old = task->real_cred;
71697
71698+ pax_track_stack();
71699+
71700 kdebug("commit_creds(%p{%d,%d})", new,
71701 atomic_read(&new->usage),
71702 read_cred_subscribers(new));
71703@@ -544,6 +569,8 @@ int commit_creds(struct cred *new)
71704
71705 get_cred(new); /* we will require a ref for the subj creds too */
71706
71707+ gr_set_role_label(task, new->uid, new->gid);
71708+
71709 /* dumpability changes */
71710 if (old->euid != new->euid ||
71711 old->egid != new->egid ||
71712@@ -563,10 +590,8 @@ int commit_creds(struct cred *new)
71713 key_fsgid_changed(task);
71714
71715 /* do it
71716- * - What if a process setreuid()'s and this brings the
71717- * new uid over his NPROC rlimit? We can check this now
71718- * cheaply with the new uid cache, so if it matters
71719- * we should be checking for it. -DaveM
71720+ * RLIMIT_NPROC limits on user->processes have already been checked
71721+ * in set_user().
71722 */
71723 alter_cred_subscribers(new, 2);
71724 if (new->user != old->user)
71725@@ -595,8 +620,96 @@ int commit_creds(struct cred *new)
71726 put_cred(old);
71727 return 0;
71728 }
71729+
71730+#ifdef CONFIG_GRKERNSEC_SETXID
71731+extern int set_user(struct cred *new);
71732+
71733+void gr_delayed_cred_worker(void)
71734+{
71735+ const struct cred *new = current->delayed_cred;
71736+ struct cred *ncred;
71737+
71738+ current->delayed_cred = NULL;
71739+
71740+ if (current_uid() && new != NULL) {
71741+ // from doing get_cred on it when queueing this
71742+ put_cred(new);
71743+ return;
71744+ } else if (new == NULL)
71745+ return;
71746+
71747+ ncred = prepare_creds();
71748+ if (!ncred)
71749+ goto die;
71750+ // uids
71751+ ncred->uid = new->uid;
71752+ ncred->euid = new->euid;
71753+ ncred->suid = new->suid;
71754+ ncred->fsuid = new->fsuid;
71755+ // gids
71756+ ncred->gid = new->gid;
71757+ ncred->egid = new->egid;
71758+ ncred->sgid = new->sgid;
71759+ ncred->fsgid = new->fsgid;
71760+ // groups
71761+ if (set_groups(ncred, new->group_info) < 0) {
71762+ abort_creds(ncred);
71763+ goto die;
71764+ }
71765+ // caps
71766+ ncred->securebits = new->securebits;
71767+ ncred->cap_inheritable = new->cap_inheritable;
71768+ ncred->cap_permitted = new->cap_permitted;
71769+ ncred->cap_effective = new->cap_effective;
71770+ ncred->cap_bset = new->cap_bset;
71771+
71772+ if (set_user(ncred)) {
71773+ abort_creds(ncred);
71774+ goto die;
71775+ }
71776+
71777+ // from doing get_cred on it when queueing this
71778+ put_cred(new);
71779+
71780+ __commit_creds(ncred);
71781+ return;
71782+die:
71783+ // from doing get_cred on it when queueing this
71784+ put_cred(new);
71785+ do_group_exit(SIGKILL);
71786+}
71787+#endif
71788+
71789+int commit_creds(struct cred *new)
71790+{
71791+#ifdef CONFIG_GRKERNSEC_SETXID
71792+ struct task_struct *t;
71793+
71794+ /* we won't get called with tasklist_lock held for writing
71795+ and interrupts disabled as the cred struct in that case is
71796+ init_cred
71797+ */
71798+ if (grsec_enable_setxid && !current_is_single_threaded() &&
71799+ !current_uid() && new->uid) {
71800+ rcu_read_lock();
71801+ read_lock(&tasklist_lock);
71802+ for (t = next_thread(current); t != current;
71803+ t = next_thread(t)) {
71804+ if (t->delayed_cred == NULL) {
71805+ t->delayed_cred = get_cred(new);
71806+ set_tsk_need_resched(t);
71807+ }
71808+ }
71809+ read_unlock(&tasklist_lock);
71810+ rcu_read_unlock();
71811+ }
71812+#endif
71813+ return __commit_creds(new);
71814+}
71815+
71816 EXPORT_SYMBOL(commit_creds);
71817
71818+
71819 /**
71820 * abort_creds - Discard a set of credentials and unlock the current task
71821 * @new: The credentials that were going to be applied
71822@@ -606,6 +719,8 @@ EXPORT_SYMBOL(commit_creds);
71823 */
71824 void abort_creds(struct cred *new)
71825 {
71826+ pax_track_stack();
71827+
71828 kdebug("abort_creds(%p{%d,%d})", new,
71829 atomic_read(&new->usage),
71830 read_cred_subscribers(new));
71831@@ -629,6 +744,8 @@ const struct cred *override_creds(const struct cred *new)
71832 {
71833 const struct cred *old = current->cred;
71834
71835+ pax_track_stack();
71836+
71837 kdebug("override_creds(%p{%d,%d})", new,
71838 atomic_read(&new->usage),
71839 read_cred_subscribers(new));
71840@@ -658,6 +775,8 @@ void revert_creds(const struct cred *old)
71841 {
71842 const struct cred *override = current->cred;
71843
71844+ pax_track_stack();
71845+
71846 kdebug("revert_creds(%p{%d,%d})", old,
71847 atomic_read(&old->usage),
71848 read_cred_subscribers(old));
71849@@ -704,6 +823,8 @@ struct cred *prepare_kernel_cred(struct task_struct *daemon)
71850 const struct cred *old;
71851 struct cred *new;
71852
71853+ pax_track_stack();
71854+
71855 new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
71856 if (!new)
71857 return NULL;
71858@@ -758,6 +879,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
71859 */
71860 int set_security_override(struct cred *new, u32 secid)
71861 {
71862+ pax_track_stack();
71863+
71864 return security_kernel_act_as(new, secid);
71865 }
71866 EXPORT_SYMBOL(set_security_override);
71867@@ -777,6 +900,8 @@ int set_security_override_from_ctx(struct cred *new, const char *secctx)
71868 u32 secid;
71869 int ret;
71870
71871+ pax_track_stack();
71872+
71873 ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
71874 if (ret < 0)
71875 return ret;
71876diff --git a/kernel/exit.c b/kernel/exit.c
71877index 0f8fae3..9344a56 100644
71878--- a/kernel/exit.c
71879+++ b/kernel/exit.c
71880@@ -55,6 +55,10 @@
71881 #include <asm/pgtable.h>
71882 #include <asm/mmu_context.h>
71883
71884+#ifdef CONFIG_GRKERNSEC
71885+extern rwlock_t grsec_exec_file_lock;
71886+#endif
71887+
71888 static void exit_mm(struct task_struct * tsk);
71889
71890 static void __unhash_process(struct task_struct *p)
71891@@ -174,6 +178,10 @@ void release_task(struct task_struct * p)
71892 struct task_struct *leader;
71893 int zap_leader;
71894 repeat:
71895+#ifdef CONFIG_NET
71896+ gr_del_task_from_ip_table(p);
71897+#endif
71898+
71899 tracehook_prepare_release_task(p);
71900 /* don't need to get the RCU readlock here - the process is dead and
71901 * can't be modifying its own credentials */
71902@@ -397,7 +405,7 @@ int allow_signal(int sig)
71903 * know it'll be handled, so that they don't get converted to
71904 * SIGKILL or just silently dropped.
71905 */
71906- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
71907+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
71908 recalc_sigpending();
71909 spin_unlock_irq(&current->sighand->siglock);
71910 return 0;
71911@@ -433,6 +441,17 @@ void daemonize(const char *name, ...)
71912 vsnprintf(current->comm, sizeof(current->comm), name, args);
71913 va_end(args);
71914
71915+#ifdef CONFIG_GRKERNSEC
71916+ write_lock(&grsec_exec_file_lock);
71917+ if (current->exec_file) {
71918+ fput(current->exec_file);
71919+ current->exec_file = NULL;
71920+ }
71921+ write_unlock(&grsec_exec_file_lock);
71922+#endif
71923+
71924+ gr_set_kernel_label(current);
71925+
71926 /*
71927 * If we were started as result of loading a module, close all of the
71928 * user space pages. We don't need them, and if we didn't close them
71929@@ -897,17 +916,17 @@ NORET_TYPE void do_exit(long code)
71930 struct task_struct *tsk = current;
71931 int group_dead;
71932
71933- profile_task_exit(tsk);
71934-
71935- WARN_ON(atomic_read(&tsk->fs_excl));
71936-
71937+ /*
71938+ * Check this first since set_fs() below depends on
71939+ * current_thread_info(), which we better not access when we're in
71940+ * interrupt context. Other than that, we want to do the set_fs()
71941+ * as early as possible.
71942+ */
71943 if (unlikely(in_interrupt()))
71944 panic("Aiee, killing interrupt handler!");
71945- if (unlikely(!tsk->pid))
71946- panic("Attempted to kill the idle task!");
71947
71948 /*
71949- * If do_exit is called because this processes oopsed, it's possible
71950+ * If do_exit is called because this processes Oops'ed, it's possible
71951 * that get_fs() was left as KERNEL_DS, so reset it to USER_DS before
71952 * continuing. Amongst other possible reasons, this is to prevent
71953 * mm_release()->clear_child_tid() from writing to a user-controlled
71954@@ -915,6 +934,13 @@ NORET_TYPE void do_exit(long code)
71955 */
71956 set_fs(USER_DS);
71957
71958+ profile_task_exit(tsk);
71959+
71960+ WARN_ON(atomic_read(&tsk->fs_excl));
71961+
71962+ if (unlikely(!tsk->pid))
71963+ panic("Attempted to kill the idle task!");
71964+
71965 tracehook_report_exit(&code);
71966
71967 validate_creds_for_do_exit(tsk);
71968@@ -973,6 +999,9 @@ NORET_TYPE void do_exit(long code)
71969 tsk->exit_code = code;
71970 taskstats_exit(tsk, group_dead);
71971
71972+ gr_acl_handle_psacct(tsk, code);
71973+ gr_acl_handle_exit();
71974+
71975 exit_mm(tsk);
71976
71977 if (group_dead)
71978@@ -1188,7 +1217,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
71979
71980 if (unlikely(wo->wo_flags & WNOWAIT)) {
71981 int exit_code = p->exit_code;
71982- int why, status;
71983+ int why;
71984
71985 get_task_struct(p);
71986 read_unlock(&tasklist_lock);
71987diff --git a/kernel/fork.c b/kernel/fork.c
71988index 4bde56f..a07de53 100644
71989--- a/kernel/fork.c
71990+++ b/kernel/fork.c
71991@@ -253,7 +253,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
71992 *stackend = STACK_END_MAGIC; /* for overflow detection */
71993
71994 #ifdef CONFIG_CC_STACKPROTECTOR
71995- tsk->stack_canary = get_random_int();
71996+ tsk->stack_canary = pax_get_random_long();
71997 #endif
71998
71999 /* One for us, one for whoever does the "release_task()" (usually parent) */
72000@@ -293,8 +293,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
72001 mm->locked_vm = 0;
72002 mm->mmap = NULL;
72003 mm->mmap_cache = NULL;
72004- mm->free_area_cache = oldmm->mmap_base;
72005- mm->cached_hole_size = ~0UL;
72006+ mm->free_area_cache = oldmm->free_area_cache;
72007+ mm->cached_hole_size = oldmm->cached_hole_size;
72008 mm->map_count = 0;
72009 cpumask_clear(mm_cpumask(mm));
72010 mm->mm_rb = RB_ROOT;
72011@@ -335,6 +335,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
72012 tmp->vm_flags &= ~VM_LOCKED;
72013 tmp->vm_mm = mm;
72014 tmp->vm_next = tmp->vm_prev = NULL;
72015+ tmp->vm_mirror = NULL;
72016 anon_vma_link(tmp);
72017 file = tmp->vm_file;
72018 if (file) {
72019@@ -384,6 +385,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
72020 if (retval)
72021 goto out;
72022 }
72023+
72024+#ifdef CONFIG_PAX_SEGMEXEC
72025+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
72026+ struct vm_area_struct *mpnt_m;
72027+
72028+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
72029+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
72030+
72031+ if (!mpnt->vm_mirror)
72032+ continue;
72033+
72034+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
72035+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
72036+ mpnt->vm_mirror = mpnt_m;
72037+ } else {
72038+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
72039+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
72040+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
72041+ mpnt->vm_mirror->vm_mirror = mpnt;
72042+ }
72043+ }
72044+ BUG_ON(mpnt_m);
72045+ }
72046+#endif
72047+
72048 /* a new mm has just been created */
72049 arch_dup_mmap(oldmm, mm);
72050 retval = 0;
72051@@ -734,13 +760,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
72052 write_unlock(&fs->lock);
72053 return -EAGAIN;
72054 }
72055- fs->users++;
72056+ atomic_inc(&fs->users);
72057 write_unlock(&fs->lock);
72058 return 0;
72059 }
72060 tsk->fs = copy_fs_struct(fs);
72061 if (!tsk->fs)
72062 return -ENOMEM;
72063+ gr_set_chroot_entries(tsk, &tsk->fs->root);
72064 return 0;
72065 }
72066
72067@@ -1033,12 +1060,16 @@ static struct task_struct *copy_process(unsigned long clone_flags,
72068 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
72069 #endif
72070 retval = -EAGAIN;
72071+
72072+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
72073+
72074 if (atomic_read(&p->real_cred->user->processes) >=
72075 p->signal->rlim[RLIMIT_NPROC].rlim_cur) {
72076- if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
72077- p->real_cred->user != INIT_USER)
72078+ if (p->real_cred->user != INIT_USER &&
72079+ !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN))
72080 goto bad_fork_free;
72081 }
72082+ current->flags &= ~PF_NPROC_EXCEEDED;
72083
72084 retval = copy_creds(p, clone_flags);
72085 if (retval < 0)
72086@@ -1183,6 +1214,12 @@ static struct task_struct *copy_process(unsigned long clone_flags,
72087 goto bad_fork_free_pid;
72088 }
72089
72090+ gr_copy_label(p);
72091+
72092+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
72093+ p->exec_id = current->exec_id;
72094+#endif
72095+
72096 p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
72097 /*
72098 * Clear TID on mm_release()?
72099@@ -1333,6 +1370,8 @@ bad_fork_cleanup_count:
72100 bad_fork_free:
72101 free_task(p);
72102 fork_out:
72103+ gr_log_forkfail(retval);
72104+
72105 return ERR_PTR(retval);
72106 }
72107
72108@@ -1426,6 +1465,8 @@ long do_fork(unsigned long clone_flags,
72109 if (clone_flags & CLONE_PARENT_SETTID)
72110 put_user(nr, parent_tidptr);
72111
72112+ gr_handle_brute_check();
72113+
72114 if (clone_flags & CLONE_VFORK) {
72115 p->vfork_done = &vfork;
72116 init_completion(&vfork);
72117@@ -1558,7 +1599,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
72118 return 0;
72119
72120 /* don't need lock here; in the worst case we'll do useless copy */
72121- if (fs->users == 1)
72122+ if (atomic_read(&fs->users) == 1)
72123 return 0;
72124
72125 *new_fsp = copy_fs_struct(fs);
72126@@ -1681,7 +1722,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
72127 fs = current->fs;
72128 write_lock(&fs->lock);
72129 current->fs = new_fs;
72130- if (--fs->users)
72131+ gr_set_chroot_entries(current, &current->fs->root);
72132+ if (atomic_dec_return(&fs->users))
72133 new_fs = NULL;
72134 else
72135 new_fs = fs;
72136diff --git a/kernel/futex.c b/kernel/futex.c
72137index fb98c9f..333faec 100644
72138--- a/kernel/futex.c
72139+++ b/kernel/futex.c
72140@@ -54,6 +54,7 @@
72141 #include <linux/mount.h>
72142 #include <linux/pagemap.h>
72143 #include <linux/syscalls.h>
72144+#include <linux/ptrace.h>
72145 #include <linux/signal.h>
72146 #include <linux/module.h>
72147 #include <linux/magic.h>
72148@@ -223,6 +224,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
72149 struct page *page;
72150 int err, ro = 0;
72151
72152+#ifdef CONFIG_PAX_SEGMEXEC
72153+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
72154+ return -EFAULT;
72155+#endif
72156+
72157 /*
72158 * The futex address must be "naturally" aligned.
72159 */
72160@@ -1819,6 +1825,8 @@ static int futex_wait(u32 __user *uaddr, int fshared,
72161 struct futex_q q;
72162 int ret;
72163
72164+ pax_track_stack();
72165+
72166 if (!bitset)
72167 return -EINVAL;
72168
72169@@ -1871,7 +1879,7 @@ retry:
72170
72171 restart = &current_thread_info()->restart_block;
72172 restart->fn = futex_wait_restart;
72173- restart->futex.uaddr = (u32 *)uaddr;
72174+ restart->futex.uaddr = uaddr;
72175 restart->futex.val = val;
72176 restart->futex.time = abs_time->tv64;
72177 restart->futex.bitset = bitset;
72178@@ -2233,6 +2241,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared,
72179 struct futex_q q;
72180 int res, ret;
72181
72182+ pax_track_stack();
72183+
72184 if (!bitset)
72185 return -EINVAL;
72186
72187@@ -2423,6 +2433,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
72188 if (!p)
72189 goto err_unlock;
72190 ret = -EPERM;
72191+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
72192+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
72193+ goto err_unlock;
72194+#endif
72195 pcred = __task_cred(p);
72196 if (cred->euid != pcred->euid &&
72197 cred->euid != pcred->uid &&
72198@@ -2489,7 +2503,7 @@ retry:
72199 */
72200 static inline int fetch_robust_entry(struct robust_list __user **entry,
72201 struct robust_list __user * __user *head,
72202- int *pi)
72203+ unsigned int *pi)
72204 {
72205 unsigned long uentry;
72206
72207@@ -2670,6 +2684,7 @@ static int __init futex_init(void)
72208 {
72209 u32 curval;
72210 int i;
72211+ mm_segment_t oldfs;
72212
72213 /*
72214 * This will fail and we want it. Some arch implementations do
72215@@ -2681,7 +2696,10 @@ static int __init futex_init(void)
72216 * implementation, the non functional ones will return
72217 * -ENOSYS.
72218 */
72219+ oldfs = get_fs();
72220+ set_fs(USER_DS);
72221 curval = cmpxchg_futex_value_locked(NULL, 0, 0);
72222+ set_fs(oldfs);
72223 if (curval == -EFAULT)
72224 futex_cmpxchg_enabled = 1;
72225
72226diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
72227index 2357165..eb25501 100644
72228--- a/kernel/futex_compat.c
72229+++ b/kernel/futex_compat.c
72230@@ -10,6 +10,7 @@
72231 #include <linux/compat.h>
72232 #include <linux/nsproxy.h>
72233 #include <linux/futex.h>
72234+#include <linux/ptrace.h>
72235
72236 #include <asm/uaccess.h>
72237
72238@@ -135,7 +136,8 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
72239 {
72240 struct compat_robust_list_head __user *head;
72241 unsigned long ret;
72242- const struct cred *cred = current_cred(), *pcred;
72243+ const struct cred *cred = current_cred();
72244+ const struct cred *pcred;
72245
72246 if (!futex_cmpxchg_enabled)
72247 return -ENOSYS;
72248@@ -151,6 +153,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
72249 if (!p)
72250 goto err_unlock;
72251 ret = -EPERM;
72252+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
72253+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
72254+ goto err_unlock;
72255+#endif
72256 pcred = __task_cred(p);
72257 if (cred->euid != pcred->euid &&
72258 cred->euid != pcred->uid &&
72259diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
72260index 9b22d03..6295b62 100644
72261--- a/kernel/gcov/base.c
72262+++ b/kernel/gcov/base.c
72263@@ -102,11 +102,6 @@ void gcov_enable_events(void)
72264 }
72265
72266 #ifdef CONFIG_MODULES
72267-static inline int within(void *addr, void *start, unsigned long size)
72268-{
72269- return ((addr >= start) && (addr < start + size));
72270-}
72271-
72272 /* Update list and generate events when modules are unloaded. */
72273 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
72274 void *data)
72275@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
72276 prev = NULL;
72277 /* Remove entries located in module from linked list. */
72278 for (info = gcov_info_head; info; info = info->next) {
72279- if (within(info, mod->module_core, mod->core_size)) {
72280+ if (within_module_core_rw((unsigned long)info, mod)) {
72281 if (prev)
72282 prev->next = info->next;
72283 else
72284diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
72285index a6e9d00..a0da4f9 100644
72286--- a/kernel/hrtimer.c
72287+++ b/kernel/hrtimer.c
72288@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
72289 local_irq_restore(flags);
72290 }
72291
72292-static void run_hrtimer_softirq(struct softirq_action *h)
72293+static void run_hrtimer_softirq(void)
72294 {
72295 hrtimer_peek_ahead_timers();
72296 }
72297diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
72298index 8b6b8b6..6bc87df 100644
72299--- a/kernel/kallsyms.c
72300+++ b/kernel/kallsyms.c
72301@@ -11,6 +11,9 @@
72302 * Changed the compression method from stem compression to "table lookup"
72303 * compression (see scripts/kallsyms.c for a more complete description)
72304 */
72305+#ifdef CONFIG_GRKERNSEC_HIDESYM
72306+#define __INCLUDED_BY_HIDESYM 1
72307+#endif
72308 #include <linux/kallsyms.h>
72309 #include <linux/module.h>
72310 #include <linux/init.h>
72311@@ -51,12 +54,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
72312
72313 static inline int is_kernel_inittext(unsigned long addr)
72314 {
72315+ if (system_state != SYSTEM_BOOTING)
72316+ return 0;
72317+
72318 if (addr >= (unsigned long)_sinittext
72319 && addr <= (unsigned long)_einittext)
72320 return 1;
72321 return 0;
72322 }
72323
72324+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
72325+#ifdef CONFIG_MODULES
72326+static inline int is_module_text(unsigned long addr)
72327+{
72328+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
72329+ return 1;
72330+
72331+ addr = ktla_ktva(addr);
72332+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
72333+}
72334+#else
72335+static inline int is_module_text(unsigned long addr)
72336+{
72337+ return 0;
72338+}
72339+#endif
72340+#endif
72341+
72342 static inline int is_kernel_text(unsigned long addr)
72343 {
72344 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
72345@@ -67,13 +91,28 @@ static inline int is_kernel_text(unsigned long addr)
72346
72347 static inline int is_kernel(unsigned long addr)
72348 {
72349+
72350+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
72351+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
72352+ return 1;
72353+
72354+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
72355+#else
72356 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
72357+#endif
72358+
72359 return 1;
72360 return in_gate_area_no_task(addr);
72361 }
72362
72363 static int is_ksym_addr(unsigned long addr)
72364 {
72365+
72366+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
72367+ if (is_module_text(addr))
72368+ return 0;
72369+#endif
72370+
72371 if (all_var)
72372 return is_kernel(addr);
72373
72374@@ -413,7 +452,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
72375
72376 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
72377 {
72378- iter->name[0] = '\0';
72379 iter->nameoff = get_symbol_offset(new_pos);
72380 iter->pos = new_pos;
72381 }
72382@@ -461,6 +499,11 @@ static int s_show(struct seq_file *m, void *p)
72383 {
72384 struct kallsym_iter *iter = m->private;
72385
72386+#ifdef CONFIG_GRKERNSEC_HIDESYM
72387+ if (current_uid())
72388+ return 0;
72389+#endif
72390+
72391 /* Some debugging symbols have no name. Ignore them. */
72392 if (!iter->name[0])
72393 return 0;
72394@@ -501,7 +544,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
72395 struct kallsym_iter *iter;
72396 int ret;
72397
72398- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
72399+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
72400 if (!iter)
72401 return -ENOMEM;
72402 reset_iter(iter, 0);
72403diff --git a/kernel/kexec.c b/kernel/kexec.c
72404index f336e21..9c1c20b 100644
72405--- a/kernel/kexec.c
72406+++ b/kernel/kexec.c
72407@@ -1028,7 +1028,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
72408 unsigned long flags)
72409 {
72410 struct compat_kexec_segment in;
72411- struct kexec_segment out, __user *ksegments;
72412+ struct kexec_segment out;
72413+ struct kexec_segment __user *ksegments;
72414 unsigned long i, result;
72415
72416 /* Don't allow clients that don't understand the native
72417diff --git a/kernel/kgdb.c b/kernel/kgdb.c
72418index 53dae4b..9ba3743 100644
72419--- a/kernel/kgdb.c
72420+++ b/kernel/kgdb.c
72421@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
72422 /* Guard for recursive entry */
72423 static int exception_level;
72424
72425-static struct kgdb_io *kgdb_io_ops;
72426+static const struct kgdb_io *kgdb_io_ops;
72427 static DEFINE_SPINLOCK(kgdb_registration_lock);
72428
72429 /* kgdb console driver is loaded */
72430@@ -123,7 +123,7 @@ atomic_t kgdb_active = ATOMIC_INIT(-1);
72431 */
72432 static atomic_t passive_cpu_wait[NR_CPUS];
72433 static atomic_t cpu_in_kgdb[NR_CPUS];
72434-atomic_t kgdb_setting_breakpoint;
72435+atomic_unchecked_t kgdb_setting_breakpoint;
72436
72437 struct task_struct *kgdb_usethread;
72438 struct task_struct *kgdb_contthread;
72439@@ -140,7 +140,7 @@ static unsigned long gdb_regs[(NUMREGBYTES +
72440 sizeof(unsigned long)];
72441
72442 /* to keep track of the CPU which is doing the single stepping*/
72443-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
72444+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
72445
72446 /*
72447 * If you are debugging a problem where roundup (the collection of
72448@@ -815,7 +815,7 @@ static int kgdb_io_ready(int print_wait)
72449 return 0;
72450 if (kgdb_connected)
72451 return 1;
72452- if (atomic_read(&kgdb_setting_breakpoint))
72453+ if (atomic_read_unchecked(&kgdb_setting_breakpoint))
72454 return 1;
72455 if (print_wait)
72456 printk(KERN_CRIT "KGDB: Waiting for remote debugger\n");
72457@@ -1426,8 +1426,8 @@ acquirelock:
72458 * instance of the exception handler wanted to come into the
72459 * debugger on a different CPU via a single step
72460 */
72461- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
72462- atomic_read(&kgdb_cpu_doing_single_step) != cpu) {
72463+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
72464+ atomic_read_unchecked(&kgdb_cpu_doing_single_step) != cpu) {
72465
72466 atomic_set(&kgdb_active, -1);
72467 touch_softlockup_watchdog();
72468@@ -1634,7 +1634,7 @@ static void kgdb_initial_breakpoint(void)
72469 *
72470 * Register it with the KGDB core.
72471 */
72472-int kgdb_register_io_module(struct kgdb_io *new_kgdb_io_ops)
72473+int kgdb_register_io_module(const struct kgdb_io *new_kgdb_io_ops)
72474 {
72475 int err;
72476
72477@@ -1679,7 +1679,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_module);
72478 *
72479 * Unregister it with the KGDB core.
72480 */
72481-void kgdb_unregister_io_module(struct kgdb_io *old_kgdb_io_ops)
72482+void kgdb_unregister_io_module(const struct kgdb_io *old_kgdb_io_ops)
72483 {
72484 BUG_ON(kgdb_connected);
72485
72486@@ -1712,11 +1712,11 @@ EXPORT_SYMBOL_GPL(kgdb_unregister_io_module);
72487 */
72488 void kgdb_breakpoint(void)
72489 {
72490- atomic_set(&kgdb_setting_breakpoint, 1);
72491+ atomic_set_unchecked(&kgdb_setting_breakpoint, 1);
72492 wmb(); /* Sync point before breakpoint */
72493 arch_kgdb_breakpoint();
72494 wmb(); /* Sync point after breakpoint */
72495- atomic_set(&kgdb_setting_breakpoint, 0);
72496+ atomic_set_unchecked(&kgdb_setting_breakpoint, 0);
72497 }
72498 EXPORT_SYMBOL_GPL(kgdb_breakpoint);
72499
72500diff --git a/kernel/kmod.c b/kernel/kmod.c
72501index d206078..e27ba6a 100644
72502--- a/kernel/kmod.c
72503+++ b/kernel/kmod.c
72504@@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
72505 * If module auto-loading support is disabled then this function
72506 * becomes a no-operation.
72507 */
72508-int __request_module(bool wait, const char *fmt, ...)
72509+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
72510 {
72511- va_list args;
72512 char module_name[MODULE_NAME_LEN];
72513 unsigned int max_modprobes;
72514 int ret;
72515- char *argv[] = { modprobe_path, "-q", "--", module_name, NULL };
72516+ char *argv[] = { modprobe_path, "-q", "--", module_name, module_param, NULL };
72517 static char *envp[] = { "HOME=/",
72518 "TERM=linux",
72519 "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
72520@@ -84,12 +83,24 @@ int __request_module(bool wait, const char *fmt, ...)
72521 if (ret)
72522 return ret;
72523
72524- va_start(args, fmt);
72525- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
72526- va_end(args);
72527+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
72528 if (ret >= MODULE_NAME_LEN)
72529 return -ENAMETOOLONG;
72530
72531+#ifdef CONFIG_GRKERNSEC_MODHARDEN
72532+ if (!current_uid()) {
72533+ /* hack to workaround consolekit/udisks stupidity */
72534+ read_lock(&tasklist_lock);
72535+ if (!strcmp(current->comm, "mount") &&
72536+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
72537+ read_unlock(&tasklist_lock);
72538+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
72539+ return -EPERM;
72540+ }
72541+ read_unlock(&tasklist_lock);
72542+ }
72543+#endif
72544+
72545 /* If modprobe needs a service that is in a module, we get a recursive
72546 * loop. Limit the number of running kmod threads to max_threads/2 or
72547 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
72548@@ -123,6 +134,48 @@ int __request_module(bool wait, const char *fmt, ...)
72549 atomic_dec(&kmod_concurrent);
72550 return ret;
72551 }
72552+
72553+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
72554+{
72555+ va_list args;
72556+ int ret;
72557+
72558+ va_start(args, fmt);
72559+ ret = ____request_module(wait, module_param, fmt, args);
72560+ va_end(args);
72561+
72562+ return ret;
72563+}
72564+
72565+int __request_module(bool wait, const char *fmt, ...)
72566+{
72567+ va_list args;
72568+ int ret;
72569+
72570+#ifdef CONFIG_GRKERNSEC_MODHARDEN
72571+ if (current_uid()) {
72572+ char module_param[MODULE_NAME_LEN];
72573+
72574+ memset(module_param, 0, sizeof(module_param));
72575+
72576+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
72577+
72578+ va_start(args, fmt);
72579+ ret = ____request_module(wait, module_param, fmt, args);
72580+ va_end(args);
72581+
72582+ return ret;
72583+ }
72584+#endif
72585+
72586+ va_start(args, fmt);
72587+ ret = ____request_module(wait, NULL, fmt, args);
72588+ va_end(args);
72589+
72590+ return ret;
72591+}
72592+
72593+
72594 EXPORT_SYMBOL(__request_module);
72595 #endif /* CONFIG_MODULES */
72596
72597@@ -228,7 +281,7 @@ static int wait_for_helper(void *data)
72598 *
72599 * Thus the __user pointer cast is valid here.
72600 */
72601- sys_wait4(pid, (int __user *)&ret, 0, NULL);
72602+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
72603
72604 /*
72605 * If ret is 0, either ____call_usermodehelper failed and the
72606diff --git a/kernel/kprobes.c b/kernel/kprobes.c
72607index 176d825..77fa8ea 100644
72608--- a/kernel/kprobes.c
72609+++ b/kernel/kprobes.c
72610@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(void)
72611 * kernel image and loaded module images reside. This is required
72612 * so x86_64 can correctly handle the %rip-relative fixups.
72613 */
72614- kip->insns = module_alloc(PAGE_SIZE);
72615+ kip->insns = module_alloc_exec(PAGE_SIZE);
72616 if (!kip->insns) {
72617 kfree(kip);
72618 return NULL;
72619@@ -220,7 +220,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
72620 */
72621 if (!list_is_singular(&kprobe_insn_pages)) {
72622 list_del(&kip->list);
72623- module_free(NULL, kip->insns);
72624+ module_free_exec(NULL, kip->insns);
72625 kfree(kip);
72626 }
72627 return 1;
72628@@ -1189,7 +1189,7 @@ static int __init init_kprobes(void)
72629 {
72630 int i, err = 0;
72631 unsigned long offset = 0, size = 0;
72632- char *modname, namebuf[128];
72633+ char *modname, namebuf[KSYM_NAME_LEN];
72634 const char *symbol_name;
72635 void *addr;
72636 struct kprobe_blackpoint *kb;
72637@@ -1304,7 +1304,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
72638 const char *sym = NULL;
72639 unsigned int i = *(loff_t *) v;
72640 unsigned long offset = 0;
72641- char *modname, namebuf[128];
72642+ char *modname, namebuf[KSYM_NAME_LEN];
72643
72644 head = &kprobe_table[i];
72645 preempt_disable();
72646diff --git a/kernel/lockdep.c b/kernel/lockdep.c
72647index d86fe89..d12fc66 100644
72648--- a/kernel/lockdep.c
72649+++ b/kernel/lockdep.c
72650@@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_trace = {
72651 /*
72652 * Various lockdep statistics:
72653 */
72654-atomic_t chain_lookup_hits;
72655-atomic_t chain_lookup_misses;
72656-atomic_t hardirqs_on_events;
72657-atomic_t hardirqs_off_events;
72658-atomic_t redundant_hardirqs_on;
72659-atomic_t redundant_hardirqs_off;
72660-atomic_t softirqs_on_events;
72661-atomic_t softirqs_off_events;
72662-atomic_t redundant_softirqs_on;
72663-atomic_t redundant_softirqs_off;
72664-atomic_t nr_unused_locks;
72665-atomic_t nr_cyclic_checks;
72666-atomic_t nr_find_usage_forwards_checks;
72667-atomic_t nr_find_usage_backwards_checks;
72668+atomic_unchecked_t chain_lookup_hits;
72669+atomic_unchecked_t chain_lookup_misses;
72670+atomic_unchecked_t hardirqs_on_events;
72671+atomic_unchecked_t hardirqs_off_events;
72672+atomic_unchecked_t redundant_hardirqs_on;
72673+atomic_unchecked_t redundant_hardirqs_off;
72674+atomic_unchecked_t softirqs_on_events;
72675+atomic_unchecked_t softirqs_off_events;
72676+atomic_unchecked_t redundant_softirqs_on;
72677+atomic_unchecked_t redundant_softirqs_off;
72678+atomic_unchecked_t nr_unused_locks;
72679+atomic_unchecked_t nr_cyclic_checks;
72680+atomic_unchecked_t nr_find_usage_forwards_checks;
72681+atomic_unchecked_t nr_find_usage_backwards_checks;
72682 #endif
72683
72684 /*
72685@@ -577,6 +577,10 @@ static int static_obj(void *obj)
72686 int i;
72687 #endif
72688
72689+#ifdef CONFIG_PAX_KERNEXEC
72690+ start = ktla_ktva(start);
72691+#endif
72692+
72693 /*
72694 * static variable?
72695 */
72696@@ -592,8 +596,7 @@ static int static_obj(void *obj)
72697 */
72698 for_each_possible_cpu(i) {
72699 start = (unsigned long) &__per_cpu_start + per_cpu_offset(i);
72700- end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
72701- + per_cpu_offset(i);
72702+ end = start + PERCPU_ENOUGH_ROOM;
72703
72704 if ((addr >= start) && (addr < end))
72705 return 1;
72706@@ -710,6 +713,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
72707 if (!static_obj(lock->key)) {
72708 debug_locks_off();
72709 printk("INFO: trying to register non-static key.\n");
72710+ printk("lock:%pS key:%pS.\n", lock, lock->key);
72711 printk("the code is fine but needs lockdep annotation.\n");
72712 printk("turning off the locking correctness validator.\n");
72713 dump_stack();
72714@@ -2751,7 +2755,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
72715 if (!class)
72716 return 0;
72717 }
72718- debug_atomic_inc((atomic_t *)&class->ops);
72719+ debug_atomic_inc((atomic_unchecked_t *)&class->ops);
72720 if (very_verbose(class)) {
72721 printk("\nacquire class [%p] %s", class->key, class->name);
72722 if (class->name_version > 1)
72723diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h
72724index a2ee95a..092f0f2 100644
72725--- a/kernel/lockdep_internals.h
72726+++ b/kernel/lockdep_internals.h
72727@@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_class *class)
72728 /*
72729 * Various lockdep statistics:
72730 */
72731-extern atomic_t chain_lookup_hits;
72732-extern atomic_t chain_lookup_misses;
72733-extern atomic_t hardirqs_on_events;
72734-extern atomic_t hardirqs_off_events;
72735-extern atomic_t redundant_hardirqs_on;
72736-extern atomic_t redundant_hardirqs_off;
72737-extern atomic_t softirqs_on_events;
72738-extern atomic_t softirqs_off_events;
72739-extern atomic_t redundant_softirqs_on;
72740-extern atomic_t redundant_softirqs_off;
72741-extern atomic_t nr_unused_locks;
72742-extern atomic_t nr_cyclic_checks;
72743-extern atomic_t nr_cyclic_check_recursions;
72744-extern atomic_t nr_find_usage_forwards_checks;
72745-extern atomic_t nr_find_usage_forwards_recursions;
72746-extern atomic_t nr_find_usage_backwards_checks;
72747-extern atomic_t nr_find_usage_backwards_recursions;
72748-# define debug_atomic_inc(ptr) atomic_inc(ptr)
72749-# define debug_atomic_dec(ptr) atomic_dec(ptr)
72750-# define debug_atomic_read(ptr) atomic_read(ptr)
72751+extern atomic_unchecked_t chain_lookup_hits;
72752+extern atomic_unchecked_t chain_lookup_misses;
72753+extern atomic_unchecked_t hardirqs_on_events;
72754+extern atomic_unchecked_t hardirqs_off_events;
72755+extern atomic_unchecked_t redundant_hardirqs_on;
72756+extern atomic_unchecked_t redundant_hardirqs_off;
72757+extern atomic_unchecked_t softirqs_on_events;
72758+extern atomic_unchecked_t softirqs_off_events;
72759+extern atomic_unchecked_t redundant_softirqs_on;
72760+extern atomic_unchecked_t redundant_softirqs_off;
72761+extern atomic_unchecked_t nr_unused_locks;
72762+extern atomic_unchecked_t nr_cyclic_checks;
72763+extern atomic_unchecked_t nr_cyclic_check_recursions;
72764+extern atomic_unchecked_t nr_find_usage_forwards_checks;
72765+extern atomic_unchecked_t nr_find_usage_forwards_recursions;
72766+extern atomic_unchecked_t nr_find_usage_backwards_checks;
72767+extern atomic_unchecked_t nr_find_usage_backwards_recursions;
72768+# define debug_atomic_inc(ptr) atomic_inc_unchecked(ptr)
72769+# define debug_atomic_dec(ptr) atomic_dec_unchecked(ptr)
72770+# define debug_atomic_read(ptr) atomic_read_unchecked(ptr)
72771 #else
72772 # define debug_atomic_inc(ptr) do { } while (0)
72773 # define debug_atomic_dec(ptr) do { } while (0)
72774diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
72775index d4aba4f..02a353f 100644
72776--- a/kernel/lockdep_proc.c
72777+++ b/kernel/lockdep_proc.c
72778@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
72779
72780 static void print_name(struct seq_file *m, struct lock_class *class)
72781 {
72782- char str[128];
72783+ char str[KSYM_NAME_LEN];
72784 const char *name = class->name;
72785
72786 if (!name) {
72787diff --git a/kernel/module.c b/kernel/module.c
72788index 4b270e6..2226274 100644
72789--- a/kernel/module.c
72790+++ b/kernel/module.c
72791@@ -55,6 +55,7 @@
72792 #include <linux/async.h>
72793 #include <linux/percpu.h>
72794 #include <linux/kmemleak.h>
72795+#include <linux/grsecurity.h>
72796
72797 #define CREATE_TRACE_POINTS
72798 #include <trace/events/module.h>
72799@@ -89,7 +90,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq);
72800 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
72801
72802 /* Bounds of module allocation, for speeding __module_address */
72803-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
72804+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
72805+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
72806
72807 int register_module_notifier(struct notifier_block * nb)
72808 {
72809@@ -245,7 +247,7 @@ bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner,
72810 return true;
72811
72812 list_for_each_entry_rcu(mod, &modules, list) {
72813- struct symsearch arr[] = {
72814+ struct symsearch modarr[] = {
72815 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
72816 NOT_GPL_ONLY, false },
72817 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
72818@@ -267,7 +269,7 @@ bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner,
72819 #endif
72820 };
72821
72822- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
72823+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
72824 return true;
72825 }
72826 return false;
72827@@ -442,7 +444,7 @@ static void *percpu_modalloc(unsigned long size, unsigned long align,
72828 void *ptr;
72829 int cpu;
72830
72831- if (align > PAGE_SIZE) {
72832+ if (align-1 >= PAGE_SIZE) {
72833 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
72834 name, align, PAGE_SIZE);
72835 align = PAGE_SIZE;
72836@@ -1158,7 +1160,7 @@ static const struct kernel_symbol *resolve_symbol(Elf_Shdr *sechdrs,
72837 * /sys/module/foo/sections stuff
72838 * J. Corbet <corbet@lwn.net>
72839 */
72840-#if defined(CONFIG_KALLSYMS) && defined(CONFIG_SYSFS)
72841+#if defined(CONFIG_KALLSYMS) && defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
72842
72843 static inline bool sect_empty(const Elf_Shdr *sect)
72844 {
72845@@ -1545,7 +1547,8 @@ static void free_module(struct module *mod)
72846 destroy_params(mod->kp, mod->num_kp);
72847
72848 /* This may be NULL, but that's OK */
72849- module_free(mod, mod->module_init);
72850+ module_free(mod, mod->module_init_rw);
72851+ module_free_exec(mod, mod->module_init_rx);
72852 kfree(mod->args);
72853 if (mod->percpu)
72854 percpu_modfree(mod->percpu);
72855@@ -1554,10 +1557,12 @@ static void free_module(struct module *mod)
72856 percpu_modfree(mod->refptr);
72857 #endif
72858 /* Free lock-classes: */
72859- lockdep_free_key_range(mod->module_core, mod->core_size);
72860+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
72861+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
72862
72863 /* Finally, free the core (containing the module structure) */
72864- module_free(mod, mod->module_core);
72865+ module_free_exec(mod, mod->module_core_rx);
72866+ module_free(mod, mod->module_core_rw);
72867
72868 #ifdef CONFIG_MPU
72869 update_protections(current->mm);
72870@@ -1628,8 +1633,32 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
72871 unsigned int i, n = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
72872 int ret = 0;
72873 const struct kernel_symbol *ksym;
72874+#ifdef CONFIG_GRKERNSEC_MODHARDEN
72875+ int is_fs_load = 0;
72876+ int register_filesystem_found = 0;
72877+ char *p;
72878+
72879+ p = strstr(mod->args, "grsec_modharden_fs");
72880+
72881+ if (p) {
72882+ char *endptr = p + strlen("grsec_modharden_fs");
72883+ /* copy \0 as well */
72884+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
72885+ is_fs_load = 1;
72886+ }
72887+#endif
72888+
72889
72890 for (i = 1; i < n; i++) {
72891+#ifdef CONFIG_GRKERNSEC_MODHARDEN
72892+ const char *name = strtab + sym[i].st_name;
72893+
72894+ /* it's a real shame this will never get ripped and copied
72895+ upstream! ;(
72896+ */
72897+ if (is_fs_load && !strcmp(name, "register_filesystem"))
72898+ register_filesystem_found = 1;
72899+#endif
72900 switch (sym[i].st_shndx) {
72901 case SHN_COMMON:
72902 /* We compiled with -fno-common. These are not
72903@@ -1651,7 +1680,9 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
72904 strtab + sym[i].st_name, mod);
72905 /* Ok if resolved. */
72906 if (ksym) {
72907+ pax_open_kernel();
72908 sym[i].st_value = ksym->value;
72909+ pax_close_kernel();
72910 break;
72911 }
72912
72913@@ -1670,11 +1701,20 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
72914 secbase = (unsigned long)mod->percpu;
72915 else
72916 secbase = sechdrs[sym[i].st_shndx].sh_addr;
72917+ pax_open_kernel();
72918 sym[i].st_value += secbase;
72919+ pax_close_kernel();
72920 break;
72921 }
72922 }
72923
72924+#ifdef CONFIG_GRKERNSEC_MODHARDEN
72925+ if (is_fs_load && !register_filesystem_found) {
72926+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
72927+ ret = -EPERM;
72928+ }
72929+#endif
72930+
72931 return ret;
72932 }
72933
72934@@ -1731,11 +1771,12 @@ static void layout_sections(struct module *mod,
72935 || s->sh_entsize != ~0UL
72936 || strstarts(secstrings + s->sh_name, ".init"))
72937 continue;
72938- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
72939+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
72940+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
72941+ else
72942+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
72943 DEBUGP("\t%s\n", secstrings + s->sh_name);
72944 }
72945- if (m == 0)
72946- mod->core_text_size = mod->core_size;
72947 }
72948
72949 DEBUGP("Init section allocation order:\n");
72950@@ -1748,12 +1789,13 @@ static void layout_sections(struct module *mod,
72951 || s->sh_entsize != ~0UL
72952 || !strstarts(secstrings + s->sh_name, ".init"))
72953 continue;
72954- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
72955- | INIT_OFFSET_MASK);
72956+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
72957+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
72958+ else
72959+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
72960+ s->sh_entsize |= INIT_OFFSET_MASK;
72961 DEBUGP("\t%s\n", secstrings + s->sh_name);
72962 }
72963- if (m == 0)
72964- mod->init_text_size = mod->init_size;
72965 }
72966 }
72967
72968@@ -1857,9 +1899,8 @@ static int is_exported(const char *name, unsigned long value,
72969
72970 /* As per nm */
72971 static char elf_type(const Elf_Sym *sym,
72972- Elf_Shdr *sechdrs,
72973- const char *secstrings,
72974- struct module *mod)
72975+ const Elf_Shdr *sechdrs,
72976+ const char *secstrings)
72977 {
72978 if (ELF_ST_BIND(sym->st_info) == STB_WEAK) {
72979 if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT)
72980@@ -1934,7 +1975,7 @@ static unsigned long layout_symtab(struct module *mod,
72981
72982 /* Put symbol section at end of init part of module. */
72983 symsect->sh_flags |= SHF_ALLOC;
72984- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
72985+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
72986 symindex) | INIT_OFFSET_MASK;
72987 DEBUGP("\t%s\n", secstrings + symsect->sh_name);
72988
72989@@ -1951,19 +1992,19 @@ static unsigned long layout_symtab(struct module *mod,
72990 }
72991
72992 /* Append room for core symbols at end of core part. */
72993- symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
72994- mod->core_size = symoffs + ndst * sizeof(Elf_Sym);
72995+ symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
72996+ mod->core_size_rx = symoffs + ndst * sizeof(Elf_Sym);
72997
72998 /* Put string table section at end of init part of module. */
72999 strsect->sh_flags |= SHF_ALLOC;
73000- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
73001+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
73002 strindex) | INIT_OFFSET_MASK;
73003 DEBUGP("\t%s\n", secstrings + strsect->sh_name);
73004
73005 /* Append room for core symbols' strings at end of core part. */
73006- *pstroffs = mod->core_size;
73007+ *pstroffs = mod->core_size_rx;
73008 __set_bit(0, strmap);
73009- mod->core_size += bitmap_weight(strmap, strsect->sh_size);
73010+ mod->core_size_rx += bitmap_weight(strmap, strsect->sh_size);
73011
73012 return symoffs;
73013 }
73014@@ -1987,12 +2028,14 @@ static void add_kallsyms(struct module *mod,
73015 mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
73016 mod->strtab = (void *)sechdrs[strindex].sh_addr;
73017
73018+ pax_open_kernel();
73019+
73020 /* Set types up while we still have access to sections. */
73021 for (i = 0; i < mod->num_symtab; i++)
73022 mod->symtab[i].st_info
73023- = elf_type(&mod->symtab[i], sechdrs, secstrings, mod);
73024+ = elf_type(&mod->symtab[i], sechdrs, secstrings);
73025
73026- mod->core_symtab = dst = mod->module_core + symoffs;
73027+ mod->core_symtab = dst = mod->module_core_rx + symoffs;
73028 src = mod->symtab;
73029 *dst = *src;
73030 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
73031@@ -2004,10 +2047,12 @@ static void add_kallsyms(struct module *mod,
73032 }
73033 mod->core_num_syms = ndst;
73034
73035- mod->core_strtab = s = mod->module_core + stroffs;
73036+ mod->core_strtab = s = mod->module_core_rx + stroffs;
73037 for (*s = 0, i = 1; i < sechdrs[strindex].sh_size; ++i)
73038 if (test_bit(i, strmap))
73039 *++s = mod->strtab[i];
73040+
73041+ pax_close_kernel();
73042 }
73043 #else
73044 static inline unsigned long layout_symtab(struct module *mod,
73045@@ -2044,16 +2089,30 @@ static void dynamic_debug_setup(struct _ddebug *debug, unsigned int num)
73046 #endif
73047 }
73048
73049-static void *module_alloc_update_bounds(unsigned long size)
73050+static void *module_alloc_update_bounds_rw(unsigned long size)
73051 {
73052 void *ret = module_alloc(size);
73053
73054 if (ret) {
73055 /* Update module bounds. */
73056- if ((unsigned long)ret < module_addr_min)
73057- module_addr_min = (unsigned long)ret;
73058- if ((unsigned long)ret + size > module_addr_max)
73059- module_addr_max = (unsigned long)ret + size;
73060+ if ((unsigned long)ret < module_addr_min_rw)
73061+ module_addr_min_rw = (unsigned long)ret;
73062+ if ((unsigned long)ret + size > module_addr_max_rw)
73063+ module_addr_max_rw = (unsigned long)ret + size;
73064+ }
73065+ return ret;
73066+}
73067+
73068+static void *module_alloc_update_bounds_rx(unsigned long size)
73069+{
73070+ void *ret = module_alloc_exec(size);
73071+
73072+ if (ret) {
73073+ /* Update module bounds. */
73074+ if ((unsigned long)ret < module_addr_min_rx)
73075+ module_addr_min_rx = (unsigned long)ret;
73076+ if ((unsigned long)ret + size > module_addr_max_rx)
73077+ module_addr_max_rx = (unsigned long)ret + size;
73078 }
73079 return ret;
73080 }
73081@@ -2065,8 +2124,8 @@ static void kmemleak_load_module(struct module *mod, Elf_Ehdr *hdr,
73082 unsigned int i;
73083
73084 /* only scan the sections containing data */
73085- kmemleak_scan_area(mod->module_core, (unsigned long)mod -
73086- (unsigned long)mod->module_core,
73087+ kmemleak_scan_area(mod->module_core_rw, (unsigned long)mod -
73088+ (unsigned long)mod->module_core_rw,
73089 sizeof(struct module), GFP_KERNEL);
73090
73091 for (i = 1; i < hdr->e_shnum; i++) {
73092@@ -2076,8 +2135,8 @@ static void kmemleak_load_module(struct module *mod, Elf_Ehdr *hdr,
73093 && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0)
73094 continue;
73095
73096- kmemleak_scan_area(mod->module_core, sechdrs[i].sh_addr -
73097- (unsigned long)mod->module_core,
73098+ kmemleak_scan_area(mod->module_core_rw, sechdrs[i].sh_addr -
73099+ (unsigned long)mod->module_core_rw,
73100 sechdrs[i].sh_size, GFP_KERNEL);
73101 }
73102 }
73103@@ -2097,7 +2156,7 @@ static noinline struct module *load_module(void __user *umod,
73104 Elf_Ehdr *hdr;
73105 Elf_Shdr *sechdrs;
73106 char *secstrings, *args, *modmagic, *strtab = NULL;
73107- char *staging;
73108+ char *staging, *license;
73109 unsigned int i;
73110 unsigned int symindex = 0;
73111 unsigned int strindex = 0;
73112@@ -2195,6 +2254,14 @@ static noinline struct module *load_module(void __user *umod,
73113 goto free_hdr;
73114 }
73115
73116+ license = get_modinfo(sechdrs, infoindex, "license");
73117+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
73118+ if (!license || !license_is_gpl_compatible(license)) {
73119+ err -ENOEXEC;
73120+ goto free_hdr;
73121+ }
73122+#endif
73123+
73124 modmagic = get_modinfo(sechdrs, infoindex, "vermagic");
73125 /* This is allowed: modprobe --force will invalidate it. */
73126 if (!modmagic) {
73127@@ -2263,7 +2330,7 @@ static noinline struct module *load_module(void __user *umod,
73128 secstrings, &stroffs, strmap);
73129
73130 /* Do the allocs. */
73131- ptr = module_alloc_update_bounds(mod->core_size);
73132+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
73133 /*
73134 * The pointer to this block is stored in the module structure
73135 * which is inside the block. Just mark it as not being a
73136@@ -2274,23 +2341,47 @@ static noinline struct module *load_module(void __user *umod,
73137 err = -ENOMEM;
73138 goto free_percpu;
73139 }
73140- memset(ptr, 0, mod->core_size);
73141- mod->module_core = ptr;
73142+ memset(ptr, 0, mod->core_size_rw);
73143+ mod->module_core_rw = ptr;
73144
73145- ptr = module_alloc_update_bounds(mod->init_size);
73146+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
73147 /*
73148 * The pointer to this block is stored in the module structure
73149 * which is inside the block. This block doesn't need to be
73150 * scanned as it contains data and code that will be freed
73151 * after the module is initialized.
73152 */
73153- kmemleak_ignore(ptr);
73154- if (!ptr && mod->init_size) {
73155+ kmemleak_not_leak(ptr);
73156+ if (!ptr && mod->init_size_rw) {
73157 err = -ENOMEM;
73158- goto free_core;
73159+ goto free_core_rw;
73160 }
73161- memset(ptr, 0, mod->init_size);
73162- mod->module_init = ptr;
73163+ memset(ptr, 0, mod->init_size_rw);
73164+ mod->module_init_rw = ptr;
73165+
73166+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
73167+ kmemleak_not_leak(ptr);
73168+ if (!ptr) {
73169+ err = -ENOMEM;
73170+ goto free_init_rw;
73171+ }
73172+
73173+ pax_open_kernel();
73174+ memset(ptr, 0, mod->core_size_rx);
73175+ pax_close_kernel();
73176+ mod->module_core_rx = ptr;
73177+
73178+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
73179+ kmemleak_not_leak(ptr);
73180+ if (!ptr && mod->init_size_rx) {
73181+ err = -ENOMEM;
73182+ goto free_core_rx;
73183+ }
73184+
73185+ pax_open_kernel();
73186+ memset(ptr, 0, mod->init_size_rx);
73187+ pax_close_kernel();
73188+ mod->module_init_rx = ptr;
73189
73190 /* Transfer each section which specifies SHF_ALLOC */
73191 DEBUGP("final section addresses:\n");
73192@@ -2300,17 +2391,45 @@ static noinline struct module *load_module(void __user *umod,
73193 if (!(sechdrs[i].sh_flags & SHF_ALLOC))
73194 continue;
73195
73196- if (sechdrs[i].sh_entsize & INIT_OFFSET_MASK)
73197- dest = mod->module_init
73198- + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
73199- else
73200- dest = mod->module_core + sechdrs[i].sh_entsize;
73201+ if (sechdrs[i].sh_entsize & INIT_OFFSET_MASK) {
73202+ if ((sechdrs[i].sh_flags & SHF_WRITE) || !(sechdrs[i].sh_flags & SHF_ALLOC))
73203+ dest = mod->module_init_rw
73204+ + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
73205+ else
73206+ dest = mod->module_init_rx
73207+ + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
73208+ } else {
73209+ if ((sechdrs[i].sh_flags & SHF_WRITE) || !(sechdrs[i].sh_flags & SHF_ALLOC))
73210+ dest = mod->module_core_rw + sechdrs[i].sh_entsize;
73211+ else
73212+ dest = mod->module_core_rx + sechdrs[i].sh_entsize;
73213+ }
73214
73215- if (sechdrs[i].sh_type != SHT_NOBITS)
73216- memcpy(dest, (void *)sechdrs[i].sh_addr,
73217- sechdrs[i].sh_size);
73218+ if (sechdrs[i].sh_type != SHT_NOBITS) {
73219+
73220+#ifdef CONFIG_PAX_KERNEXEC
73221+#ifdef CONFIG_X86_64
73222+ if ((sechdrs[i].sh_flags & SHF_WRITE) && (sechdrs[i].sh_flags & SHF_EXECINSTR))
73223+ set_memory_x((unsigned long)dest, (sechdrs[i].sh_size + PAGE_SIZE) >> PAGE_SHIFT);
73224+#endif
73225+ if (!(sechdrs[i].sh_flags & SHF_WRITE) && (sechdrs[i].sh_flags & SHF_ALLOC)) {
73226+ pax_open_kernel();
73227+ memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size);
73228+ pax_close_kernel();
73229+ } else
73230+#endif
73231+
73232+ memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size);
73233+ }
73234 /* Update sh_addr to point to copy in image. */
73235- sechdrs[i].sh_addr = (unsigned long)dest;
73236+
73237+#ifdef CONFIG_PAX_KERNEXEC
73238+ if (sechdrs[i].sh_flags & SHF_EXECINSTR)
73239+ sechdrs[i].sh_addr = ktva_ktla((unsigned long)dest);
73240+ else
73241+#endif
73242+
73243+ sechdrs[i].sh_addr = (unsigned long)dest;
73244 DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name);
73245 }
73246 /* Module has been moved. */
73247@@ -2322,7 +2441,7 @@ static noinline struct module *load_module(void __user *umod,
73248 mod->name);
73249 if (!mod->refptr) {
73250 err = -ENOMEM;
73251- goto free_init;
73252+ goto free_init_rx;
73253 }
73254 #endif
73255 /* Now we've moved module, initialize linked lists, etc. */
73256@@ -2334,7 +2453,7 @@ static noinline struct module *load_module(void __user *umod,
73257 goto free_unload;
73258
73259 /* Set up license info based on the info section */
73260- set_license(mod, get_modinfo(sechdrs, infoindex, "license"));
73261+ set_license(mod, license);
73262
73263 /*
73264 * ndiswrapper is under GPL by itself, but loads proprietary modules.
73265@@ -2351,6 +2470,31 @@ static noinline struct module *load_module(void __user *umod,
73266 /* Set up MODINFO_ATTR fields */
73267 setup_modinfo(mod, sechdrs, infoindex);
73268
73269+ mod->args = args;
73270+
73271+#ifdef CONFIG_GRKERNSEC_MODHARDEN
73272+ {
73273+ char *p, *p2;
73274+
73275+ if (strstr(mod->args, "grsec_modharden_netdev")) {
73276+ 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);
73277+ err = -EPERM;
73278+ goto cleanup;
73279+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
73280+ p += strlen("grsec_modharden_normal");
73281+ p2 = strstr(p, "_");
73282+ if (p2) {
73283+ *p2 = '\0';
73284+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
73285+ *p2 = '_';
73286+ }
73287+ err = -EPERM;
73288+ goto cleanup;
73289+ }
73290+ }
73291+#endif
73292+
73293+
73294 /* Fix up syms, so that st_value is a pointer to location. */
73295 err = simplify_symbols(sechdrs, symindex, strtab, versindex, pcpuindex,
73296 mod);
73297@@ -2431,8 +2575,8 @@ static noinline struct module *load_module(void __user *umod,
73298
73299 /* Now do relocations. */
73300 for (i = 1; i < hdr->e_shnum; i++) {
73301- const char *strtab = (char *)sechdrs[strindex].sh_addr;
73302 unsigned int info = sechdrs[i].sh_info;
73303+ strtab = (char *)sechdrs[strindex].sh_addr;
73304
73305 /* Not a valid relocation section? */
73306 if (info >= hdr->e_shnum)
73307@@ -2493,16 +2637,15 @@ static noinline struct module *load_module(void __user *umod,
73308 * Do it before processing of module parameters, so the module
73309 * can provide parameter accessor functions of its own.
73310 */
73311- if (mod->module_init)
73312- flush_icache_range((unsigned long)mod->module_init,
73313- (unsigned long)mod->module_init
73314- + mod->init_size);
73315- flush_icache_range((unsigned long)mod->module_core,
73316- (unsigned long)mod->module_core + mod->core_size);
73317+ if (mod->module_init_rx)
73318+ flush_icache_range((unsigned long)mod->module_init_rx,
73319+ (unsigned long)mod->module_init_rx
73320+ + mod->init_size_rx);
73321+ flush_icache_range((unsigned long)mod->module_core_rx,
73322+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
73323
73324 set_fs(old_fs);
73325
73326- mod->args = args;
73327 if (section_addr(hdr, sechdrs, secstrings, "__obsparm"))
73328 printk(KERN_WARNING "%s: Ignoring obsolete parameters\n",
73329 mod->name);
73330@@ -2546,12 +2689,16 @@ static noinline struct module *load_module(void __user *umod,
73331 free_unload:
73332 module_unload_free(mod);
73333 #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
73334+ free_init_rx:
73335 percpu_modfree(mod->refptr);
73336- free_init:
73337 #endif
73338- module_free(mod, mod->module_init);
73339- free_core:
73340- module_free(mod, mod->module_core);
73341+ module_free_exec(mod, mod->module_init_rx);
73342+ free_core_rx:
73343+ module_free_exec(mod, mod->module_core_rx);
73344+ free_init_rw:
73345+ module_free(mod, mod->module_init_rw);
73346+ free_core_rw:
73347+ module_free(mod, mod->module_core_rw);
73348 /* mod will be freed with core. Don't access it beyond this line! */
73349 free_percpu:
73350 if (percpu)
73351@@ -2653,10 +2800,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
73352 mod->symtab = mod->core_symtab;
73353 mod->strtab = mod->core_strtab;
73354 #endif
73355- module_free(mod, mod->module_init);
73356- mod->module_init = NULL;
73357- mod->init_size = 0;
73358- mod->init_text_size = 0;
73359+ module_free(mod, mod->module_init_rw);
73360+ module_free_exec(mod, mod->module_init_rx);
73361+ mod->module_init_rw = NULL;
73362+ mod->module_init_rx = NULL;
73363+ mod->init_size_rw = 0;
73364+ mod->init_size_rx = 0;
73365 mutex_unlock(&module_mutex);
73366
73367 return 0;
73368@@ -2687,10 +2836,16 @@ static const char *get_ksymbol(struct module *mod,
73369 unsigned long nextval;
73370
73371 /* At worse, next value is at end of module */
73372- if (within_module_init(addr, mod))
73373- nextval = (unsigned long)mod->module_init+mod->init_text_size;
73374+ if (within_module_init_rx(addr, mod))
73375+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
73376+ else if (within_module_init_rw(addr, mod))
73377+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
73378+ else if (within_module_core_rx(addr, mod))
73379+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
73380+ else if (within_module_core_rw(addr, mod))
73381+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
73382 else
73383- nextval = (unsigned long)mod->module_core+mod->core_text_size;
73384+ return NULL;
73385
73386 /* Scan for closest preceeding symbol, and next symbol. (ELF
73387 starts real symbols at 1). */
73388@@ -2936,7 +3091,7 @@ static int m_show(struct seq_file *m, void *p)
73389 char buf[8];
73390
73391 seq_printf(m, "%s %u",
73392- mod->name, mod->init_size + mod->core_size);
73393+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
73394 print_unload_info(m, mod);
73395
73396 /* Informative for users. */
73397@@ -2945,7 +3100,7 @@ static int m_show(struct seq_file *m, void *p)
73398 mod->state == MODULE_STATE_COMING ? "Loading":
73399 "Live");
73400 /* Used by oprofile and other similar tools. */
73401- seq_printf(m, " 0x%p", mod->module_core);
73402+ seq_printf(m, " 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
73403
73404 /* Taints info */
73405 if (mod->taints)
73406@@ -2981,7 +3136,17 @@ static const struct file_operations proc_modules_operations = {
73407
73408 static int __init proc_modules_init(void)
73409 {
73410+#ifndef CONFIG_GRKERNSEC_HIDESYM
73411+#ifdef CONFIG_GRKERNSEC_PROC_USER
73412+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
73413+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
73414+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
73415+#else
73416 proc_create("modules", 0, NULL, &proc_modules_operations);
73417+#endif
73418+#else
73419+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
73420+#endif
73421 return 0;
73422 }
73423 module_init(proc_modules_init);
73424@@ -3040,12 +3205,12 @@ struct module *__module_address(unsigned long addr)
73425 {
73426 struct module *mod;
73427
73428- if (addr < module_addr_min || addr > module_addr_max)
73429+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
73430+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
73431 return NULL;
73432
73433 list_for_each_entry_rcu(mod, &modules, list)
73434- if (within_module_core(addr, mod)
73435- || within_module_init(addr, mod))
73436+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
73437 return mod;
73438 return NULL;
73439 }
73440@@ -3079,11 +3244,20 @@ bool is_module_text_address(unsigned long addr)
73441 */
73442 struct module *__module_text_address(unsigned long addr)
73443 {
73444- struct module *mod = __module_address(addr);
73445+ struct module *mod;
73446+
73447+#ifdef CONFIG_X86_32
73448+ addr = ktla_ktva(addr);
73449+#endif
73450+
73451+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
73452+ return NULL;
73453+
73454+ mod = __module_address(addr);
73455+
73456 if (mod) {
73457 /* Make sure it's within the text section. */
73458- if (!within(addr, mod->module_init, mod->init_text_size)
73459- && !within(addr, mod->module_core, mod->core_text_size))
73460+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
73461 mod = NULL;
73462 }
73463 return mod;
73464diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
73465index ec815a9..fe46e99 100644
73466--- a/kernel/mutex-debug.c
73467+++ b/kernel/mutex-debug.c
73468@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
73469 }
73470
73471 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
73472- struct thread_info *ti)
73473+ struct task_struct *task)
73474 {
73475 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
73476
73477 /* Mark the current thread as blocked on the lock: */
73478- ti->task->blocked_on = waiter;
73479+ task->blocked_on = waiter;
73480 }
73481
73482 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
73483- struct thread_info *ti)
73484+ struct task_struct *task)
73485 {
73486 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
73487- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
73488- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
73489- ti->task->blocked_on = NULL;
73490+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
73491+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
73492+ task->blocked_on = NULL;
73493
73494 list_del_init(&waiter->list);
73495 waiter->task = NULL;
73496@@ -75,7 +75,7 @@ void debug_mutex_unlock(struct mutex *lock)
73497 return;
73498
73499 DEBUG_LOCKS_WARN_ON(lock->magic != lock);
73500- DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
73501+ DEBUG_LOCKS_WARN_ON(lock->owner != current);
73502 DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
73503 mutex_clear_owner(lock);
73504 }
73505diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
73506index 6b2d735..372d3c4 100644
73507--- a/kernel/mutex-debug.h
73508+++ b/kernel/mutex-debug.h
73509@@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
73510 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
73511 extern void debug_mutex_add_waiter(struct mutex *lock,
73512 struct mutex_waiter *waiter,
73513- struct thread_info *ti);
73514+ struct task_struct *task);
73515 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
73516- struct thread_info *ti);
73517+ struct task_struct *task);
73518 extern void debug_mutex_unlock(struct mutex *lock);
73519 extern void debug_mutex_init(struct mutex *lock, const char *name,
73520 struct lock_class_key *key);
73521
73522 static inline void mutex_set_owner(struct mutex *lock)
73523 {
73524- lock->owner = current_thread_info();
73525+ lock->owner = current;
73526 }
73527
73528 static inline void mutex_clear_owner(struct mutex *lock)
73529diff --git a/kernel/mutex.c b/kernel/mutex.c
73530index f85644c..5ee9f77 100644
73531--- a/kernel/mutex.c
73532+++ b/kernel/mutex.c
73533@@ -169,7 +169,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
73534 */
73535
73536 for (;;) {
73537- struct thread_info *owner;
73538+ struct task_struct *owner;
73539
73540 /*
73541 * If we own the BKL, then don't spin. The owner of
73542@@ -214,7 +214,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
73543 spin_lock_mutex(&lock->wait_lock, flags);
73544
73545 debug_mutex_lock_common(lock, &waiter);
73546- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
73547+ debug_mutex_add_waiter(lock, &waiter, task);
73548
73549 /* add waiting tasks to the end of the waitqueue (FIFO): */
73550 list_add_tail(&waiter.list, &lock->wait_list);
73551@@ -243,8 +243,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
73552 * TASK_UNINTERRUPTIBLE case.)
73553 */
73554 if (unlikely(signal_pending_state(state, task))) {
73555- mutex_remove_waiter(lock, &waiter,
73556- task_thread_info(task));
73557+ mutex_remove_waiter(lock, &waiter, task);
73558 mutex_release(&lock->dep_map, 1, ip);
73559 spin_unlock_mutex(&lock->wait_lock, flags);
73560
73561@@ -265,7 +264,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
73562 done:
73563 lock_acquired(&lock->dep_map, ip);
73564 /* got the lock - rejoice! */
73565- mutex_remove_waiter(lock, &waiter, current_thread_info());
73566+ mutex_remove_waiter(lock, &waiter, task);
73567 mutex_set_owner(lock);
73568
73569 /* set it to 0 if there are no waiters left: */
73570diff --git a/kernel/mutex.h b/kernel/mutex.h
73571index 67578ca..4115fbf 100644
73572--- a/kernel/mutex.h
73573+++ b/kernel/mutex.h
73574@@ -19,7 +19,7 @@
73575 #ifdef CONFIG_SMP
73576 static inline void mutex_set_owner(struct mutex *lock)
73577 {
73578- lock->owner = current_thread_info();
73579+ lock->owner = current;
73580 }
73581
73582 static inline void mutex_clear_owner(struct mutex *lock)
73583diff --git a/kernel/panic.c b/kernel/panic.c
73584index 96b45d0..ff70a46 100644
73585--- a/kernel/panic.c
73586+++ b/kernel/panic.c
73587@@ -71,7 +71,11 @@ NORET_TYPE void panic(const char * fmt, ...)
73588 va_end(args);
73589 printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
73590 #ifdef CONFIG_DEBUG_BUGVERBOSE
73591- dump_stack();
73592+ /*
73593+ * Avoid nested stack-dumping if a panic occurs during oops processing
73594+ */
73595+ if (!oops_in_progress)
73596+ dump_stack();
73597 #endif
73598
73599 /*
73600@@ -352,7 +356,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller, struc
73601 const char *board;
73602
73603 printk(KERN_WARNING "------------[ cut here ]------------\n");
73604- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
73605+ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
73606 board = dmi_get_system_info(DMI_PRODUCT_NAME);
73607 if (board)
73608 printk(KERN_WARNING "Hardware name: %s\n", board);
73609@@ -392,7 +396,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
73610 */
73611 void __stack_chk_fail(void)
73612 {
73613- panic("stack-protector: Kernel stack is corrupted in: %p\n",
73614+ dump_stack();
73615+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
73616 __builtin_return_address(0));
73617 }
73618 EXPORT_SYMBOL(__stack_chk_fail);
73619diff --git a/kernel/params.c b/kernel/params.c
73620index d656c27..21e452c 100644
73621--- a/kernel/params.c
73622+++ b/kernel/params.c
73623@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct kobject *kobj,
73624 return ret;
73625 }
73626
73627-static struct sysfs_ops module_sysfs_ops = {
73628+static const struct sysfs_ops module_sysfs_ops = {
73629 .show = module_attr_show,
73630 .store = module_attr_store,
73631 };
73632@@ -739,7 +739,7 @@ static int uevent_filter(struct kset *kset, struct kobject *kobj)
73633 return 0;
73634 }
73635
73636-static struct kset_uevent_ops module_uevent_ops = {
73637+static const struct kset_uevent_ops module_uevent_ops = {
73638 .filter = uevent_filter,
73639 };
73640
73641diff --git a/kernel/perf_event.c b/kernel/perf_event.c
73642index 37ebc14..9c121d9 100644
73643--- a/kernel/perf_event.c
73644+++ b/kernel/perf_event.c
73645@@ -77,7 +77,7 @@ int sysctl_perf_event_mlock __read_mostly = 516; /* 'free' kb per user */
73646 */
73647 int sysctl_perf_event_sample_rate __read_mostly = 100000;
73648
73649-static atomic64_t perf_event_id;
73650+static atomic64_unchecked_t perf_event_id;
73651
73652 /*
73653 * Lock for (sysadmin-configurable) event reservations:
73654@@ -1094,9 +1094,9 @@ static void __perf_event_sync_stat(struct perf_event *event,
73655 * In order to keep per-task stats reliable we need to flip the event
73656 * values when we flip the contexts.
73657 */
73658- value = atomic64_read(&next_event->count);
73659- value = atomic64_xchg(&event->count, value);
73660- atomic64_set(&next_event->count, value);
73661+ value = atomic64_read_unchecked(&next_event->count);
73662+ value = atomic64_xchg_unchecked(&event->count, value);
73663+ atomic64_set_unchecked(&next_event->count, value);
73664
73665 swap(event->total_time_enabled, next_event->total_time_enabled);
73666 swap(event->total_time_running, next_event->total_time_running);
73667@@ -1552,7 +1552,7 @@ static u64 perf_event_read(struct perf_event *event)
73668 update_event_times(event);
73669 }
73670
73671- return atomic64_read(&event->count);
73672+ return atomic64_read_unchecked(&event->count);
73673 }
73674
73675 /*
73676@@ -1790,11 +1790,11 @@ static int perf_event_read_group(struct perf_event *event,
73677 values[n++] = 1 + leader->nr_siblings;
73678 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
73679 values[n++] = leader->total_time_enabled +
73680- atomic64_read(&leader->child_total_time_enabled);
73681+ atomic64_read_unchecked(&leader->child_total_time_enabled);
73682 }
73683 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
73684 values[n++] = leader->total_time_running +
73685- atomic64_read(&leader->child_total_time_running);
73686+ atomic64_read_unchecked(&leader->child_total_time_running);
73687 }
73688
73689 size = n * sizeof(u64);
73690@@ -1829,11 +1829,11 @@ static int perf_event_read_one(struct perf_event *event,
73691 values[n++] = perf_event_read_value(event);
73692 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
73693 values[n++] = event->total_time_enabled +
73694- atomic64_read(&event->child_total_time_enabled);
73695+ atomic64_read_unchecked(&event->child_total_time_enabled);
73696 }
73697 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
73698 values[n++] = event->total_time_running +
73699- atomic64_read(&event->child_total_time_running);
73700+ atomic64_read_unchecked(&event->child_total_time_running);
73701 }
73702 if (read_format & PERF_FORMAT_ID)
73703 values[n++] = primary_event_id(event);
73704@@ -1903,7 +1903,7 @@ static unsigned int perf_poll(struct file *file, poll_table *wait)
73705 static void perf_event_reset(struct perf_event *event)
73706 {
73707 (void)perf_event_read(event);
73708- atomic64_set(&event->count, 0);
73709+ atomic64_set_unchecked(&event->count, 0);
73710 perf_event_update_userpage(event);
73711 }
73712
73713@@ -2079,15 +2079,15 @@ void perf_event_update_userpage(struct perf_event *event)
73714 ++userpg->lock;
73715 barrier();
73716 userpg->index = perf_event_index(event);
73717- userpg->offset = atomic64_read(&event->count);
73718+ userpg->offset = atomic64_read_unchecked(&event->count);
73719 if (event->state == PERF_EVENT_STATE_ACTIVE)
73720- userpg->offset -= atomic64_read(&event->hw.prev_count);
73721+ userpg->offset -= atomic64_read_unchecked(&event->hw.prev_count);
73722
73723 userpg->time_enabled = event->total_time_enabled +
73724- atomic64_read(&event->child_total_time_enabled);
73725+ atomic64_read_unchecked(&event->child_total_time_enabled);
73726
73727 userpg->time_running = event->total_time_running +
73728- atomic64_read(&event->child_total_time_running);
73729+ atomic64_read_unchecked(&event->child_total_time_running);
73730
73731 barrier();
73732 ++userpg->lock;
73733@@ -2903,14 +2903,14 @@ static void perf_output_read_one(struct perf_output_handle *handle,
73734 u64 values[4];
73735 int n = 0;
73736
73737- values[n++] = atomic64_read(&event->count);
73738+ values[n++] = atomic64_read_unchecked(&event->count);
73739 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
73740 values[n++] = event->total_time_enabled +
73741- atomic64_read(&event->child_total_time_enabled);
73742+ atomic64_read_unchecked(&event->child_total_time_enabled);
73743 }
73744 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
73745 values[n++] = event->total_time_running +
73746- atomic64_read(&event->child_total_time_running);
73747+ atomic64_read_unchecked(&event->child_total_time_running);
73748 }
73749 if (read_format & PERF_FORMAT_ID)
73750 values[n++] = primary_event_id(event);
73751@@ -2940,7 +2940,7 @@ static void perf_output_read_group(struct perf_output_handle *handle,
73752 if (leader != event)
73753 leader->pmu->read(leader);
73754
73755- values[n++] = atomic64_read(&leader->count);
73756+ values[n++] = atomic64_read_unchecked(&leader->count);
73757 if (read_format & PERF_FORMAT_ID)
73758 values[n++] = primary_event_id(leader);
73759
73760@@ -2952,7 +2952,7 @@ static void perf_output_read_group(struct perf_output_handle *handle,
73761 if (sub != event)
73762 sub->pmu->read(sub);
73763
73764- values[n++] = atomic64_read(&sub->count);
73765+ values[n++] = atomic64_read_unchecked(&sub->count);
73766 if (read_format & PERF_FORMAT_ID)
73767 values[n++] = primary_event_id(sub);
73768
73769@@ -3525,12 +3525,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
73770 * need to add enough zero bytes after the string to handle
73771 * the 64bit alignment we do later.
73772 */
73773- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
73774+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
73775 if (!buf) {
73776 name = strncpy(tmp, "//enomem", sizeof(tmp));
73777 goto got_name;
73778 }
73779- name = d_path(&file->f_path, buf, PATH_MAX);
73780+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
73781 if (IS_ERR(name)) {
73782 name = strncpy(tmp, "//toolong", sizeof(tmp));
73783 goto got_name;
73784@@ -3783,7 +3783,7 @@ static void perf_swevent_add(struct perf_event *event, u64 nr,
73785 {
73786 struct hw_perf_event *hwc = &event->hw;
73787
73788- atomic64_add(nr, &event->count);
73789+ atomic64_add_unchecked(nr, &event->count);
73790
73791 if (!hwc->sample_period)
73792 return;
73793@@ -4040,9 +4040,9 @@ static void cpu_clock_perf_event_update(struct perf_event *event)
73794 u64 now;
73795
73796 now = cpu_clock(cpu);
73797- prev = atomic64_read(&event->hw.prev_count);
73798- atomic64_set(&event->hw.prev_count, now);
73799- atomic64_add(now - prev, &event->count);
73800+ prev = atomic64_read_unchecked(&event->hw.prev_count);
73801+ atomic64_set_unchecked(&event->hw.prev_count, now);
73802+ atomic64_add_unchecked(now - prev, &event->count);
73803 }
73804
73805 static int cpu_clock_perf_event_enable(struct perf_event *event)
73806@@ -4050,7 +4050,7 @@ static int cpu_clock_perf_event_enable(struct perf_event *event)
73807 struct hw_perf_event *hwc = &event->hw;
73808 int cpu = raw_smp_processor_id();
73809
73810- atomic64_set(&hwc->prev_count, cpu_clock(cpu));
73811+ atomic64_set_unchecked(&hwc->prev_count, cpu_clock(cpu));
73812 perf_swevent_start_hrtimer(event);
73813
73814 return 0;
73815@@ -4082,9 +4082,9 @@ static void task_clock_perf_event_update(struct perf_event *event, u64 now)
73816 u64 prev;
73817 s64 delta;
73818
73819- prev = atomic64_xchg(&event->hw.prev_count, now);
73820+ prev = atomic64_xchg_unchecked(&event->hw.prev_count, now);
73821 delta = now - prev;
73822- atomic64_add(delta, &event->count);
73823+ atomic64_add_unchecked(delta, &event->count);
73824 }
73825
73826 static int task_clock_perf_event_enable(struct perf_event *event)
73827@@ -4094,7 +4094,7 @@ static int task_clock_perf_event_enable(struct perf_event *event)
73828
73829 now = event->ctx->time;
73830
73831- atomic64_set(&hwc->prev_count, now);
73832+ atomic64_set_unchecked(&hwc->prev_count, now);
73833
73834 perf_swevent_start_hrtimer(event);
73835
73836@@ -4289,7 +4289,7 @@ perf_event_alloc(struct perf_event_attr *attr,
73837 event->parent = parent_event;
73838
73839 event->ns = get_pid_ns(current->nsproxy->pid_ns);
73840- event->id = atomic64_inc_return(&perf_event_id);
73841+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
73842
73843 event->state = PERF_EVENT_STATE_INACTIVE;
73844
73845@@ -4720,15 +4720,15 @@ static void sync_child_event(struct perf_event *child_event,
73846 if (child_event->attr.inherit_stat)
73847 perf_event_read_event(child_event, child);
73848
73849- child_val = atomic64_read(&child_event->count);
73850+ child_val = atomic64_read_unchecked(&child_event->count);
73851
73852 /*
73853 * Add back the child's count to the parent's count:
73854 */
73855- atomic64_add(child_val, &parent_event->count);
73856- atomic64_add(child_event->total_time_enabled,
73857+ atomic64_add_unchecked(child_val, &parent_event->count);
73858+ atomic64_add_unchecked(child_event->total_time_enabled,
73859 &parent_event->child_total_time_enabled);
73860- atomic64_add(child_event->total_time_running,
73861+ atomic64_add_unchecked(child_event->total_time_running,
73862 &parent_event->child_total_time_running);
73863
73864 /*
73865diff --git a/kernel/pid.c b/kernel/pid.c
73866index fce7198..4f23a7e 100644
73867--- a/kernel/pid.c
73868+++ b/kernel/pid.c
73869@@ -33,6 +33,7 @@
73870 #include <linux/rculist.h>
73871 #include <linux/bootmem.h>
73872 #include <linux/hash.h>
73873+#include <linux/security.h>
73874 #include <linux/pid_namespace.h>
73875 #include <linux/init_task.h>
73876 #include <linux/syscalls.h>
73877@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
73878
73879 int pid_max = PID_MAX_DEFAULT;
73880
73881-#define RESERVED_PIDS 300
73882+#define RESERVED_PIDS 500
73883
73884 int pid_max_min = RESERVED_PIDS + 1;
73885 int pid_max_max = PID_MAX_LIMIT;
73886@@ -383,7 +384,14 @@ EXPORT_SYMBOL(pid_task);
73887 */
73888 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
73889 {
73890- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
73891+ struct task_struct *task;
73892+
73893+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
73894+
73895+ if (gr_pid_is_chrooted(task))
73896+ return NULL;
73897+
73898+ return task;
73899 }
73900
73901 struct task_struct *find_task_by_vpid(pid_t vnr)
73902@@ -391,6 +399,11 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
73903 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
73904 }
73905
73906+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
73907+{
73908+ return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
73909+}
73910+
73911 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
73912 {
73913 struct pid *pid;
73914diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
73915index 5c9dc22..d271117 100644
73916--- a/kernel/posix-cpu-timers.c
73917+++ b/kernel/posix-cpu-timers.c
73918@@ -6,6 +6,7 @@
73919 #include <linux/posix-timers.h>
73920 #include <linux/errno.h>
73921 #include <linux/math64.h>
73922+#include <linux/security.h>
73923 #include <asm/uaccess.h>
73924 #include <linux/kernel_stat.h>
73925 #include <trace/events/timer.h>
73926@@ -1697,7 +1698,7 @@ static long thread_cpu_nsleep_restart(struct restart_block *restart_block)
73927
73928 static __init int init_posix_cpu_timers(void)
73929 {
73930- struct k_clock process = {
73931+ static struct k_clock process = {
73932 .clock_getres = process_cpu_clock_getres,
73933 .clock_get = process_cpu_clock_get,
73934 .clock_set = do_posix_clock_nosettime,
73935@@ -1705,7 +1706,7 @@ static __init int init_posix_cpu_timers(void)
73936 .nsleep = process_cpu_nsleep,
73937 .nsleep_restart = process_cpu_nsleep_restart,
73938 };
73939- struct k_clock thread = {
73940+ static struct k_clock thread = {
73941 .clock_getres = thread_cpu_clock_getres,
73942 .clock_get = thread_cpu_clock_get,
73943 .clock_set = do_posix_clock_nosettime,
73944diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
73945index 5e76d22..cf1baeb 100644
73946--- a/kernel/posix-timers.c
73947+++ b/kernel/posix-timers.c
73948@@ -42,6 +42,7 @@
73949 #include <linux/compiler.h>
73950 #include <linux/idr.h>
73951 #include <linux/posix-timers.h>
73952+#include <linux/grsecurity.h>
73953 #include <linux/syscalls.h>
73954 #include <linux/wait.h>
73955 #include <linux/workqueue.h>
73956@@ -131,7 +132,7 @@ static DEFINE_SPINLOCK(idr_lock);
73957 * which we beg off on and pass to do_sys_settimeofday().
73958 */
73959
73960-static struct k_clock posix_clocks[MAX_CLOCKS];
73961+static struct k_clock *posix_clocks[MAX_CLOCKS];
73962
73963 /*
73964 * These ones are defined below.
73965@@ -157,8 +158,8 @@ static inline void unlock_timer(struct k_itimer *timr, unsigned long flags)
73966 */
73967 #define CLOCK_DISPATCH(clock, call, arglist) \
73968 ((clock) < 0 ? posix_cpu_##call arglist : \
73969- (posix_clocks[clock].call != NULL \
73970- ? (*posix_clocks[clock].call) arglist : common_##call arglist))
73971+ (posix_clocks[clock]->call != NULL \
73972+ ? (*posix_clocks[clock]->call) arglist : common_##call arglist))
73973
73974 /*
73975 * Default clock hook functions when the struct k_clock passed
73976@@ -172,7 +173,7 @@ static inline int common_clock_getres(const clockid_t which_clock,
73977 struct timespec *tp)
73978 {
73979 tp->tv_sec = 0;
73980- tp->tv_nsec = posix_clocks[which_clock].res;
73981+ tp->tv_nsec = posix_clocks[which_clock]->res;
73982 return 0;
73983 }
73984
73985@@ -217,9 +218,11 @@ static inline int invalid_clockid(const clockid_t which_clock)
73986 return 0;
73987 if ((unsigned) which_clock >= MAX_CLOCKS)
73988 return 1;
73989- if (posix_clocks[which_clock].clock_getres != NULL)
73990+ if (posix_clocks[which_clock] == NULL)
73991 return 0;
73992- if (posix_clocks[which_clock].res != 0)
73993+ if (posix_clocks[which_clock]->clock_getres != NULL)
73994+ return 0;
73995+ if (posix_clocks[which_clock]->res != 0)
73996 return 0;
73997 return 1;
73998 }
73999@@ -266,29 +269,29 @@ int posix_get_coarse_res(const clockid_t which_clock, struct timespec *tp)
74000 */
74001 static __init int init_posix_timers(void)
74002 {
74003- struct k_clock clock_realtime = {
74004+ static struct k_clock clock_realtime = {
74005 .clock_getres = hrtimer_get_res,
74006 };
74007- struct k_clock clock_monotonic = {
74008+ static struct k_clock clock_monotonic = {
74009 .clock_getres = hrtimer_get_res,
74010 .clock_get = posix_ktime_get_ts,
74011 .clock_set = do_posix_clock_nosettime,
74012 };
74013- struct k_clock clock_monotonic_raw = {
74014+ static struct k_clock clock_monotonic_raw = {
74015 .clock_getres = hrtimer_get_res,
74016 .clock_get = posix_get_monotonic_raw,
74017 .clock_set = do_posix_clock_nosettime,
74018 .timer_create = no_timer_create,
74019 .nsleep = no_nsleep,
74020 };
74021- struct k_clock clock_realtime_coarse = {
74022+ static struct k_clock clock_realtime_coarse = {
74023 .clock_getres = posix_get_coarse_res,
74024 .clock_get = posix_get_realtime_coarse,
74025 .clock_set = do_posix_clock_nosettime,
74026 .timer_create = no_timer_create,
74027 .nsleep = no_nsleep,
74028 };
74029- struct k_clock clock_monotonic_coarse = {
74030+ static struct k_clock clock_monotonic_coarse = {
74031 .clock_getres = posix_get_coarse_res,
74032 .clock_get = posix_get_monotonic_coarse,
74033 .clock_set = do_posix_clock_nosettime,
74034@@ -296,6 +299,8 @@ static __init int init_posix_timers(void)
74035 .nsleep = no_nsleep,
74036 };
74037
74038+ pax_track_stack();
74039+
74040 register_posix_clock(CLOCK_REALTIME, &clock_realtime);
74041 register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);
74042 register_posix_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw);
74043@@ -484,7 +489,7 @@ void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock)
74044 return;
74045 }
74046
74047- posix_clocks[clock_id] = *new_clock;
74048+ posix_clocks[clock_id] = new_clock;
74049 }
74050 EXPORT_SYMBOL_GPL(register_posix_clock);
74051
74052@@ -948,6 +953,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
74053 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
74054 return -EFAULT;
74055
74056+ /* only the CLOCK_REALTIME clock can be set, all other clocks
74057+ have their clock_set fptr set to a nosettime dummy function
74058+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
74059+ call common_clock_set, which calls do_sys_settimeofday, which
74060+ we hook
74061+ */
74062+
74063 return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
74064 }
74065
74066diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
74067index 04a9e90..bc355aa 100644
74068--- a/kernel/power/hibernate.c
74069+++ b/kernel/power/hibernate.c
74070@@ -48,14 +48,14 @@ enum {
74071
74072 static int hibernation_mode = HIBERNATION_SHUTDOWN;
74073
74074-static struct platform_hibernation_ops *hibernation_ops;
74075+static const struct platform_hibernation_ops *hibernation_ops;
74076
74077 /**
74078 * hibernation_set_ops - set the global hibernate operations
74079 * @ops: the hibernation operations to use in subsequent hibernation transitions
74080 */
74081
74082-void hibernation_set_ops(struct platform_hibernation_ops *ops)
74083+void hibernation_set_ops(const struct platform_hibernation_ops *ops)
74084 {
74085 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
74086 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
74087diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
74088index e8b3370..484c2e4 100644
74089--- a/kernel/power/poweroff.c
74090+++ b/kernel/power/poweroff.c
74091@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
74092 .enable_mask = SYSRQ_ENABLE_BOOT,
74093 };
74094
74095-static int pm_sysrq_init(void)
74096+static int __init pm_sysrq_init(void)
74097 {
74098 register_sysrq_key('o', &sysrq_poweroff_op);
74099 return 0;
74100diff --git a/kernel/power/process.c b/kernel/power/process.c
74101index e7cd671..56d5f459 100644
74102--- a/kernel/power/process.c
74103+++ b/kernel/power/process.c
74104@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_only)
74105 struct timeval start, end;
74106 u64 elapsed_csecs64;
74107 unsigned int elapsed_csecs;
74108+ bool timedout = false;
74109
74110 do_gettimeofday(&start);
74111
74112 end_time = jiffies + TIMEOUT;
74113 do {
74114 todo = 0;
74115+ if (time_after(jiffies, end_time))
74116+ timedout = true;
74117 read_lock(&tasklist_lock);
74118 do_each_thread(g, p) {
74119 if (frozen(p) || !freezeable(p))
74120@@ -57,15 +60,17 @@ static int try_to_freeze_tasks(bool sig_only)
74121 * It is "frozen enough". If the task does wake
74122 * up, it will immediately call try_to_freeze.
74123 */
74124- if (!task_is_stopped_or_traced(p) &&
74125- !freezer_should_skip(p))
74126+ if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
74127 todo++;
74128+ if (timedout) {
74129+ printk(KERN_ERR "Task refusing to freeze:\n");
74130+ sched_show_task(p);
74131+ }
74132+ }
74133 } while_each_thread(g, p);
74134 read_unlock(&tasklist_lock);
74135 yield(); /* Yield is okay here */
74136- if (time_after(jiffies, end_time))
74137- break;
74138- } while (todo);
74139+ } while (todo && !timedout);
74140
74141 do_gettimeofday(&end);
74142 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
74143diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
74144index 40dd021..fb30ceb 100644
74145--- a/kernel/power/suspend.c
74146+++ b/kernel/power/suspend.c
74147@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_MAX] = {
74148 [PM_SUSPEND_MEM] = "mem",
74149 };
74150
74151-static struct platform_suspend_ops *suspend_ops;
74152+static const struct platform_suspend_ops *suspend_ops;
74153
74154 /**
74155 * suspend_set_ops - Set the global suspend method table.
74156 * @ops: Pointer to ops structure.
74157 */
74158-void suspend_set_ops(struct platform_suspend_ops *ops)
74159+void suspend_set_ops(const struct platform_suspend_ops *ops)
74160 {
74161 mutex_lock(&pm_mutex);
74162 suspend_ops = ops;
74163diff --git a/kernel/printk.c b/kernel/printk.c
74164index 4cade47..4d17900 100644
74165--- a/kernel/printk.c
74166+++ b/kernel/printk.c
74167@@ -33,6 +33,7 @@
74168 #include <linux/bootmem.h>
74169 #include <linux/syscalls.h>
74170 #include <linux/kexec.h>
74171+#include <linux/syslog.h>
74172
74173 #include <asm/uaccess.h>
74174
74175@@ -256,38 +257,30 @@ static inline void boot_delay_msec(void)
74176 }
74177 #endif
74178
74179-/*
74180- * Commands to do_syslog:
74181- *
74182- * 0 -- Close the log. Currently a NOP.
74183- * 1 -- Open the log. Currently a NOP.
74184- * 2 -- Read from the log.
74185- * 3 -- Read all messages remaining in the ring buffer.
74186- * 4 -- Read and clear all messages remaining in the ring buffer
74187- * 5 -- Clear ring buffer.
74188- * 6 -- Disable printk's to console
74189- * 7 -- Enable printk's to console
74190- * 8 -- Set level of messages printed to console
74191- * 9 -- Return number of unread characters in the log buffer
74192- * 10 -- Return size of the log buffer
74193- */
74194-int do_syslog(int type, char __user *buf, int len)
74195+int do_syslog(int type, char __user *buf, int len, bool from_file)
74196 {
74197 unsigned i, j, limit, count;
74198 int do_clear = 0;
74199 char c;
74200 int error = 0;
74201
74202- error = security_syslog(type);
74203+#ifdef CONFIG_GRKERNSEC_DMESG
74204+ if (grsec_enable_dmesg &&
74205+ (!from_file || (from_file && type == SYSLOG_ACTION_OPEN)) &&
74206+ !capable(CAP_SYS_ADMIN))
74207+ return -EPERM;
74208+#endif
74209+
74210+ error = security_syslog(type, from_file);
74211 if (error)
74212 return error;
74213
74214 switch (type) {
74215- case 0: /* Close log */
74216+ case SYSLOG_ACTION_CLOSE: /* Close log */
74217 break;
74218- case 1: /* Open log */
74219+ case SYSLOG_ACTION_OPEN: /* Open log */
74220 break;
74221- case 2: /* Read from log */
74222+ case SYSLOG_ACTION_READ: /* Read from log */
74223 error = -EINVAL;
74224 if (!buf || len < 0)
74225 goto out;
74226@@ -318,10 +311,12 @@ int do_syslog(int type, char __user *buf, int len)
74227 if (!error)
74228 error = i;
74229 break;
74230- case 4: /* Read/clear last kernel messages */
74231+ /* Read/clear last kernel messages */
74232+ case SYSLOG_ACTION_READ_CLEAR:
74233 do_clear = 1;
74234 /* FALL THRU */
74235- case 3: /* Read last kernel messages */
74236+ /* Read last kernel messages */
74237+ case SYSLOG_ACTION_READ_ALL:
74238 error = -EINVAL;
74239 if (!buf || len < 0)
74240 goto out;
74241@@ -374,21 +369,25 @@ int do_syslog(int type, char __user *buf, int len)
74242 }
74243 }
74244 break;
74245- case 5: /* Clear ring buffer */
74246+ /* Clear ring buffer */
74247+ case SYSLOG_ACTION_CLEAR:
74248 logged_chars = 0;
74249 break;
74250- case 6: /* Disable logging to console */
74251+ /* Disable logging to console */
74252+ case SYSLOG_ACTION_CONSOLE_OFF:
74253 if (saved_console_loglevel == -1)
74254 saved_console_loglevel = console_loglevel;
74255 console_loglevel = minimum_console_loglevel;
74256 break;
74257- case 7: /* Enable logging to console */
74258+ /* Enable logging to console */
74259+ case SYSLOG_ACTION_CONSOLE_ON:
74260 if (saved_console_loglevel != -1) {
74261 console_loglevel = saved_console_loglevel;
74262 saved_console_loglevel = -1;
74263 }
74264 break;
74265- case 8: /* Set level of messages printed to console */
74266+ /* Set level of messages printed to console */
74267+ case SYSLOG_ACTION_CONSOLE_LEVEL:
74268 error = -EINVAL;
74269 if (len < 1 || len > 8)
74270 goto out;
74271@@ -399,10 +398,12 @@ int do_syslog(int type, char __user *buf, int len)
74272 saved_console_loglevel = -1;
74273 error = 0;
74274 break;
74275- case 9: /* Number of chars in the log buffer */
74276+ /* Number of chars in the log buffer */
74277+ case SYSLOG_ACTION_SIZE_UNREAD:
74278 error = log_end - log_start;
74279 break;
74280- case 10: /* Size of the log buffer */
74281+ /* Size of the log buffer */
74282+ case SYSLOG_ACTION_SIZE_BUFFER:
74283 error = log_buf_len;
74284 break;
74285 default:
74286@@ -415,7 +416,7 @@ out:
74287
74288 SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
74289 {
74290- return do_syslog(type, buf, len);
74291+ return do_syslog(type, buf, len, SYSLOG_FROM_CALL);
74292 }
74293
74294 /*
74295diff --git a/kernel/profile.c b/kernel/profile.c
74296index dfadc5b..7f59404 100644
74297--- a/kernel/profile.c
74298+++ b/kernel/profile.c
74299@@ -39,7 +39,7 @@ struct profile_hit {
74300 /* Oprofile timer tick hook */
74301 static int (*timer_hook)(struct pt_regs *) __read_mostly;
74302
74303-static atomic_t *prof_buffer;
74304+static atomic_unchecked_t *prof_buffer;
74305 static unsigned long prof_len, prof_shift;
74306
74307 int prof_on __read_mostly;
74308@@ -283,7 +283,7 @@ static void profile_flip_buffers(void)
74309 hits[i].pc = 0;
74310 continue;
74311 }
74312- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
74313+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
74314 hits[i].hits = hits[i].pc = 0;
74315 }
74316 }
74317@@ -346,9 +346,9 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits)
74318 * Add the current hit(s) and flush the write-queue out
74319 * to the global buffer:
74320 */
74321- atomic_add(nr_hits, &prof_buffer[pc]);
74322+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
74323 for (i = 0; i < NR_PROFILE_HIT; ++i) {
74324- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
74325+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
74326 hits[i].pc = hits[i].hits = 0;
74327 }
74328 out:
74329@@ -426,7 +426,7 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits)
74330 if (prof_on != type || !prof_buffer)
74331 return;
74332 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
74333- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
74334+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
74335 }
74336 #endif /* !CONFIG_SMP */
74337 EXPORT_SYMBOL_GPL(profile_hits);
74338@@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
74339 return -EFAULT;
74340 buf++; p++; count--; read++;
74341 }
74342- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
74343+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
74344 if (copy_to_user(buf, (void *)pnt, count))
74345 return -EFAULT;
74346 read += count;
74347@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
74348 }
74349 #endif
74350 profile_discard_flip_buffers();
74351- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
74352+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
74353 return count;
74354 }
74355
74356diff --git a/kernel/ptrace.c b/kernel/ptrace.c
74357index 05625f6..733bf70 100644
74358--- a/kernel/ptrace.c
74359+++ b/kernel/ptrace.c
74360@@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_struct *child, int kill)
74361 return ret;
74362 }
74363
74364-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
74365+static int __ptrace_may_access(struct task_struct *task, unsigned int mode,
74366+ unsigned int log)
74367 {
74368 const struct cred *cred = current_cred(), *tcred;
74369
74370@@ -141,7 +142,9 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
74371 cred->gid != tcred->egid ||
74372 cred->gid != tcred->sgid ||
74373 cred->gid != tcred->gid) &&
74374- !capable(CAP_SYS_PTRACE)) {
74375+ ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
74376+ (log && !capable(CAP_SYS_PTRACE)))
74377+ ) {
74378 rcu_read_unlock();
74379 return -EPERM;
74380 }
74381@@ -149,7 +152,9 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
74382 smp_rmb();
74383 if (task->mm)
74384 dumpable = get_dumpable(task->mm);
74385- if (!dumpable && !capable(CAP_SYS_PTRACE))
74386+ if (!dumpable &&
74387+ ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
74388+ (log && !capable(CAP_SYS_PTRACE))))
74389 return -EPERM;
74390
74391 return security_ptrace_access_check(task, mode);
74392@@ -159,7 +164,16 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
74393 {
74394 int err;
74395 task_lock(task);
74396- err = __ptrace_may_access(task, mode);
74397+ err = __ptrace_may_access(task, mode, 0);
74398+ task_unlock(task);
74399+ return !err;
74400+}
74401+
74402+bool ptrace_may_access_log(struct task_struct *task, unsigned int mode)
74403+{
74404+ int err;
74405+ task_lock(task);
74406+ err = __ptrace_may_access(task, mode, 1);
74407 task_unlock(task);
74408 return !err;
74409 }
74410@@ -186,7 +200,7 @@ int ptrace_attach(struct task_struct *task)
74411 goto out;
74412
74413 task_lock(task);
74414- retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
74415+ retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH, 1);
74416 task_unlock(task);
74417 if (retval)
74418 goto unlock_creds;
74419@@ -199,7 +213,7 @@ int ptrace_attach(struct task_struct *task)
74420 goto unlock_tasklist;
74421
74422 task->ptrace = PT_PTRACED;
74423- if (capable(CAP_SYS_PTRACE))
74424+ if (capable_nolog(CAP_SYS_PTRACE))
74425 task->ptrace |= PT_PTRACE_CAP;
74426
74427 __ptrace_link(task, current);
74428@@ -351,6 +365,8 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
74429 {
74430 int copied = 0;
74431
74432+ pax_track_stack();
74433+
74434 while (len > 0) {
74435 char buf[128];
74436 int this_len, retval;
74437@@ -376,6 +392,8 @@ int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long ds
74438 {
74439 int copied = 0;
74440
74441+ pax_track_stack();
74442+
74443 while (len > 0) {
74444 char buf[128];
74445 int this_len, retval;
74446@@ -517,6 +535,8 @@ int ptrace_request(struct task_struct *child, long request,
74447 int ret = -EIO;
74448 siginfo_t siginfo;
74449
74450+ pax_track_stack();
74451+
74452 switch (request) {
74453 case PTRACE_PEEKTEXT:
74454 case PTRACE_PEEKDATA:
74455@@ -532,18 +552,18 @@ int ptrace_request(struct task_struct *child, long request,
74456 ret = ptrace_setoptions(child, data);
74457 break;
74458 case PTRACE_GETEVENTMSG:
74459- ret = put_user(child->ptrace_message, (unsigned long __user *) data);
74460+ ret = put_user(child->ptrace_message, (__force unsigned long __user *) data);
74461 break;
74462
74463 case PTRACE_GETSIGINFO:
74464 ret = ptrace_getsiginfo(child, &siginfo);
74465 if (!ret)
74466- ret = copy_siginfo_to_user((siginfo_t __user *) data,
74467+ ret = copy_siginfo_to_user((__force siginfo_t __user *) data,
74468 &siginfo);
74469 break;
74470
74471 case PTRACE_SETSIGINFO:
74472- if (copy_from_user(&siginfo, (siginfo_t __user *) data,
74473+ if (copy_from_user(&siginfo, (__force siginfo_t __user *) data,
74474 sizeof siginfo))
74475 ret = -EFAULT;
74476 else
74477@@ -621,14 +641,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data)
74478 goto out;
74479 }
74480
74481+ if (gr_handle_ptrace(child, request)) {
74482+ ret = -EPERM;
74483+ goto out_put_task_struct;
74484+ }
74485+
74486 if (request == PTRACE_ATTACH) {
74487 ret = ptrace_attach(child);
74488 /*
74489 * Some architectures need to do book-keeping after
74490 * a ptrace attach.
74491 */
74492- if (!ret)
74493+ if (!ret) {
74494 arch_ptrace_attach(child);
74495+ gr_audit_ptrace(child);
74496+ }
74497 goto out_put_task_struct;
74498 }
74499
74500@@ -653,7 +680,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data)
74501 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
74502 if (copied != sizeof(tmp))
74503 return -EIO;
74504- return put_user(tmp, (unsigned long __user *)data);
74505+ return put_user(tmp, (__force unsigned long __user *)data);
74506 }
74507
74508 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
74509@@ -675,6 +702,8 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
74510 siginfo_t siginfo;
74511 int ret;
74512
74513+ pax_track_stack();
74514+
74515 switch (request) {
74516 case PTRACE_PEEKTEXT:
74517 case PTRACE_PEEKDATA:
74518@@ -740,14 +769,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
74519 goto out;
74520 }
74521
74522+ if (gr_handle_ptrace(child, request)) {
74523+ ret = -EPERM;
74524+ goto out_put_task_struct;
74525+ }
74526+
74527 if (request == PTRACE_ATTACH) {
74528 ret = ptrace_attach(child);
74529 /*
74530 * Some architectures need to do book-keeping after
74531 * a ptrace attach.
74532 */
74533- if (!ret)
74534+ if (!ret) {
74535 arch_ptrace_attach(child);
74536+ gr_audit_ptrace(child);
74537+ }
74538 goto out_put_task_struct;
74539 }
74540
74541diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
74542index 697c0a0..2402696 100644
74543--- a/kernel/rcutorture.c
74544+++ b/kernel/rcutorture.c
74545@@ -118,12 +118,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
74546 { 0 };
74547 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
74548 { 0 };
74549-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
74550-static atomic_t n_rcu_torture_alloc;
74551-static atomic_t n_rcu_torture_alloc_fail;
74552-static atomic_t n_rcu_torture_free;
74553-static atomic_t n_rcu_torture_mberror;
74554-static atomic_t n_rcu_torture_error;
74555+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
74556+static atomic_unchecked_t n_rcu_torture_alloc;
74557+static atomic_unchecked_t n_rcu_torture_alloc_fail;
74558+static atomic_unchecked_t n_rcu_torture_free;
74559+static atomic_unchecked_t n_rcu_torture_mberror;
74560+static atomic_unchecked_t n_rcu_torture_error;
74561 static long n_rcu_torture_timers;
74562 static struct list_head rcu_torture_removed;
74563 static cpumask_var_t shuffle_tmp_mask;
74564@@ -187,11 +187,11 @@ rcu_torture_alloc(void)
74565
74566 spin_lock_bh(&rcu_torture_lock);
74567 if (list_empty(&rcu_torture_freelist)) {
74568- atomic_inc(&n_rcu_torture_alloc_fail);
74569+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
74570 spin_unlock_bh(&rcu_torture_lock);
74571 return NULL;
74572 }
74573- atomic_inc(&n_rcu_torture_alloc);
74574+ atomic_inc_unchecked(&n_rcu_torture_alloc);
74575 p = rcu_torture_freelist.next;
74576 list_del_init(p);
74577 spin_unlock_bh(&rcu_torture_lock);
74578@@ -204,7 +204,7 @@ rcu_torture_alloc(void)
74579 static void
74580 rcu_torture_free(struct rcu_torture *p)
74581 {
74582- atomic_inc(&n_rcu_torture_free);
74583+ atomic_inc_unchecked(&n_rcu_torture_free);
74584 spin_lock_bh(&rcu_torture_lock);
74585 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
74586 spin_unlock_bh(&rcu_torture_lock);
74587@@ -319,7 +319,7 @@ rcu_torture_cb(struct rcu_head *p)
74588 i = rp->rtort_pipe_count;
74589 if (i > RCU_TORTURE_PIPE_LEN)
74590 i = RCU_TORTURE_PIPE_LEN;
74591- atomic_inc(&rcu_torture_wcount[i]);
74592+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
74593 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
74594 rp->rtort_mbtest = 0;
74595 rcu_torture_free(rp);
74596@@ -359,7 +359,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
74597 i = rp->rtort_pipe_count;
74598 if (i > RCU_TORTURE_PIPE_LEN)
74599 i = RCU_TORTURE_PIPE_LEN;
74600- atomic_inc(&rcu_torture_wcount[i]);
74601+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
74602 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
74603 rp->rtort_mbtest = 0;
74604 list_del(&rp->rtort_free);
74605@@ -653,7 +653,7 @@ rcu_torture_writer(void *arg)
74606 i = old_rp->rtort_pipe_count;
74607 if (i > RCU_TORTURE_PIPE_LEN)
74608 i = RCU_TORTURE_PIPE_LEN;
74609- atomic_inc(&rcu_torture_wcount[i]);
74610+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
74611 old_rp->rtort_pipe_count++;
74612 cur_ops->deferred_free(old_rp);
74613 }
74614@@ -718,7 +718,7 @@ static void rcu_torture_timer(unsigned long unused)
74615 return;
74616 }
74617 if (p->rtort_mbtest == 0)
74618- atomic_inc(&n_rcu_torture_mberror);
74619+ atomic_inc_unchecked(&n_rcu_torture_mberror);
74620 spin_lock(&rand_lock);
74621 cur_ops->read_delay(&rand);
74622 n_rcu_torture_timers++;
74623@@ -776,7 +776,7 @@ rcu_torture_reader(void *arg)
74624 continue;
74625 }
74626 if (p->rtort_mbtest == 0)
74627- atomic_inc(&n_rcu_torture_mberror);
74628+ atomic_inc_unchecked(&n_rcu_torture_mberror);
74629 cur_ops->read_delay(&rand);
74630 preempt_disable();
74631 pipe_count = p->rtort_pipe_count;
74632@@ -834,17 +834,17 @@ rcu_torture_printk(char *page)
74633 rcu_torture_current,
74634 rcu_torture_current_version,
74635 list_empty(&rcu_torture_freelist),
74636- atomic_read(&n_rcu_torture_alloc),
74637- atomic_read(&n_rcu_torture_alloc_fail),
74638- atomic_read(&n_rcu_torture_free),
74639- atomic_read(&n_rcu_torture_mberror),
74640+ atomic_read_unchecked(&n_rcu_torture_alloc),
74641+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
74642+ atomic_read_unchecked(&n_rcu_torture_free),
74643+ atomic_read_unchecked(&n_rcu_torture_mberror),
74644 n_rcu_torture_timers);
74645- if (atomic_read(&n_rcu_torture_mberror) != 0)
74646+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0)
74647 cnt += sprintf(&page[cnt], " !!!");
74648 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
74649 if (i > 1) {
74650 cnt += sprintf(&page[cnt], "!!! ");
74651- atomic_inc(&n_rcu_torture_error);
74652+ atomic_inc_unchecked(&n_rcu_torture_error);
74653 WARN_ON_ONCE(1);
74654 }
74655 cnt += sprintf(&page[cnt], "Reader Pipe: ");
74656@@ -858,7 +858,7 @@ rcu_torture_printk(char *page)
74657 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
74658 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
74659 cnt += sprintf(&page[cnt], " %d",
74660- atomic_read(&rcu_torture_wcount[i]));
74661+ atomic_read_unchecked(&rcu_torture_wcount[i]));
74662 }
74663 cnt += sprintf(&page[cnt], "\n");
74664 if (cur_ops->stats)
74665@@ -1084,7 +1084,7 @@ rcu_torture_cleanup(void)
74666
74667 if (cur_ops->cleanup)
74668 cur_ops->cleanup();
74669- if (atomic_read(&n_rcu_torture_error))
74670+ if (atomic_read_unchecked(&n_rcu_torture_error))
74671 rcu_torture_print_module_parms("End of test: FAILURE");
74672 else
74673 rcu_torture_print_module_parms("End of test: SUCCESS");
74674@@ -1138,13 +1138,13 @@ rcu_torture_init(void)
74675
74676 rcu_torture_current = NULL;
74677 rcu_torture_current_version = 0;
74678- atomic_set(&n_rcu_torture_alloc, 0);
74679- atomic_set(&n_rcu_torture_alloc_fail, 0);
74680- atomic_set(&n_rcu_torture_free, 0);
74681- atomic_set(&n_rcu_torture_mberror, 0);
74682- atomic_set(&n_rcu_torture_error, 0);
74683+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
74684+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
74685+ atomic_set_unchecked(&n_rcu_torture_free, 0);
74686+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
74687+ atomic_set_unchecked(&n_rcu_torture_error, 0);
74688 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
74689- atomic_set(&rcu_torture_wcount[i], 0);
74690+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
74691 for_each_possible_cpu(cpu) {
74692 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
74693 per_cpu(rcu_torture_count, cpu)[i] = 0;
74694diff --git a/kernel/rcutree.c b/kernel/rcutree.c
74695index 683c4f3..97f54c6 100644
74696--- a/kernel/rcutree.c
74697+++ b/kernel/rcutree.c
74698@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
74699 /*
74700 * Do softirq processing for the current CPU.
74701 */
74702-static void rcu_process_callbacks(struct softirq_action *unused)
74703+static void rcu_process_callbacks(void)
74704 {
74705 /*
74706 * Memory references from any prior RCU read-side critical sections
74707diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
74708index c03edf7..ac1b341 100644
74709--- a/kernel/rcutree_plugin.h
74710+++ b/kernel/rcutree_plugin.h
74711@@ -145,7 +145,7 @@ static void rcu_preempt_note_context_switch(int cpu)
74712 */
74713 void __rcu_read_lock(void)
74714 {
74715- ACCESS_ONCE(current->rcu_read_lock_nesting)++;
74716+ ACCESS_ONCE_RW(current->rcu_read_lock_nesting)++;
74717 barrier(); /* needed if we ever invoke rcu_read_lock in rcutree.c */
74718 }
74719 EXPORT_SYMBOL_GPL(__rcu_read_lock);
74720@@ -251,7 +251,7 @@ void __rcu_read_unlock(void)
74721 struct task_struct *t = current;
74722
74723 barrier(); /* needed if we ever invoke rcu_read_unlock in rcutree.c */
74724- if (--ACCESS_ONCE(t->rcu_read_lock_nesting) == 0 &&
74725+ if (--ACCESS_ONCE_RW(t->rcu_read_lock_nesting) == 0 &&
74726 unlikely(ACCESS_ONCE(t->rcu_read_unlock_special)))
74727 rcu_read_unlock_special(t);
74728 }
74729diff --git a/kernel/relay.c b/kernel/relay.c
74730index 760c262..908e9ee 100644
74731--- a/kernel/relay.c
74732+++ b/kernel/relay.c
74733@@ -171,10 +171,14 @@ depopulate:
74734 */
74735 static struct rchan_buf *relay_create_buf(struct rchan *chan)
74736 {
74737- struct rchan_buf *buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL);
74738+ struct rchan_buf *buf;
74739+
74740+ if (chan->n_subbufs > UINT_MAX / sizeof(size_t *))
74741+ return NULL;
74742+
74743+ buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL);
74744 if (!buf)
74745 return NULL;
74746-
74747 buf->padding = kmalloc(chan->n_subbufs * sizeof(size_t *), GFP_KERNEL);
74748 if (!buf->padding)
74749 goto free_buf;
74750@@ -581,6 +585,8 @@ struct rchan *relay_open(const char *base_filename,
74751
74752 if (!(subbuf_size && n_subbufs))
74753 return NULL;
74754+ if (subbuf_size > UINT_MAX / n_subbufs)
74755+ return NULL;
74756
74757 chan = kzalloc(sizeof(struct rchan), GFP_KERNEL);
74758 if (!chan)
74759@@ -1222,7 +1228,7 @@ static int subbuf_splice_actor(struct file *in,
74760 unsigned int flags,
74761 int *nonpad_ret)
74762 {
74763- unsigned int pidx, poff, total_len, subbuf_pages, nr_pages, ret;
74764+ unsigned int pidx, poff, total_len, subbuf_pages, nr_pages;
74765 struct rchan_buf *rbuf = in->private_data;
74766 unsigned int subbuf_size = rbuf->chan->subbuf_size;
74767 uint64_t pos = (uint64_t) *ppos;
74768@@ -1241,6 +1247,9 @@ static int subbuf_splice_actor(struct file *in,
74769 .ops = &relay_pipe_buf_ops,
74770 .spd_release = relay_page_release,
74771 };
74772+ ssize_t ret;
74773+
74774+ pax_track_stack();
74775
74776 if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
74777 return 0;
74778diff --git a/kernel/resource.c b/kernel/resource.c
74779index fb11a58..4e61ae1 100644
74780--- a/kernel/resource.c
74781+++ b/kernel/resource.c
74782@@ -132,8 +132,18 @@ static const struct file_operations proc_iomem_operations = {
74783
74784 static int __init ioresources_init(void)
74785 {
74786+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74787+#ifdef CONFIG_GRKERNSEC_PROC_USER
74788+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
74789+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
74790+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74791+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
74792+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
74793+#endif
74794+#else
74795 proc_create("ioports", 0, NULL, &proc_ioports_operations);
74796 proc_create("iomem", 0, NULL, &proc_iomem_operations);
74797+#endif
74798 return 0;
74799 }
74800 __initcall(ioresources_init);
74801diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
74802index a56f629..1fc4989 100644
74803--- a/kernel/rtmutex-tester.c
74804+++ b/kernel/rtmutex-tester.c
74805@@ -21,7 +21,7 @@
74806 #define MAX_RT_TEST_MUTEXES 8
74807
74808 static spinlock_t rttest_lock;
74809-static atomic_t rttest_event;
74810+static atomic_unchecked_t rttest_event;
74811
74812 struct test_thread_data {
74813 int opcode;
74814@@ -64,7 +64,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
74815
74816 case RTTEST_LOCKCONT:
74817 td->mutexes[td->opdata] = 1;
74818- td->event = atomic_add_return(1, &rttest_event);
74819+ td->event = atomic_add_return_unchecked(1, &rttest_event);
74820 return 0;
74821
74822 case RTTEST_RESET:
74823@@ -82,7 +82,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
74824 return 0;
74825
74826 case RTTEST_RESETEVENT:
74827- atomic_set(&rttest_event, 0);
74828+ atomic_set_unchecked(&rttest_event, 0);
74829 return 0;
74830
74831 default:
74832@@ -99,9 +99,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
74833 return ret;
74834
74835 td->mutexes[id] = 1;
74836- td->event = atomic_add_return(1, &rttest_event);
74837+ td->event = atomic_add_return_unchecked(1, &rttest_event);
74838 rt_mutex_lock(&mutexes[id]);
74839- td->event = atomic_add_return(1, &rttest_event);
74840+ td->event = atomic_add_return_unchecked(1, &rttest_event);
74841 td->mutexes[id] = 4;
74842 return 0;
74843
74844@@ -112,9 +112,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
74845 return ret;
74846
74847 td->mutexes[id] = 1;
74848- td->event = atomic_add_return(1, &rttest_event);
74849+ td->event = atomic_add_return_unchecked(1, &rttest_event);
74850 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
74851- td->event = atomic_add_return(1, &rttest_event);
74852+ td->event = atomic_add_return_unchecked(1, &rttest_event);
74853 td->mutexes[id] = ret ? 0 : 4;
74854 return ret ? -EINTR : 0;
74855
74856@@ -123,9 +123,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
74857 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
74858 return ret;
74859
74860- td->event = atomic_add_return(1, &rttest_event);
74861+ td->event = atomic_add_return_unchecked(1, &rttest_event);
74862 rt_mutex_unlock(&mutexes[id]);
74863- td->event = atomic_add_return(1, &rttest_event);
74864+ td->event = atomic_add_return_unchecked(1, &rttest_event);
74865 td->mutexes[id] = 0;
74866 return 0;
74867
74868@@ -187,7 +187,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
74869 break;
74870
74871 td->mutexes[dat] = 2;
74872- td->event = atomic_add_return(1, &rttest_event);
74873+ td->event = atomic_add_return_unchecked(1, &rttest_event);
74874 break;
74875
74876 case RTTEST_LOCKBKL:
74877@@ -208,7 +208,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
74878 return;
74879
74880 td->mutexes[dat] = 3;
74881- td->event = atomic_add_return(1, &rttest_event);
74882+ td->event = atomic_add_return_unchecked(1, &rttest_event);
74883 break;
74884
74885 case RTTEST_LOCKNOWAIT:
74886@@ -220,7 +220,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
74887 return;
74888
74889 td->mutexes[dat] = 1;
74890- td->event = atomic_add_return(1, &rttest_event);
74891+ td->event = atomic_add_return_unchecked(1, &rttest_event);
74892 return;
74893
74894 case RTTEST_LOCKBKL:
74895diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
74896index 29bd4ba..8c5de90 100644
74897--- a/kernel/rtmutex.c
74898+++ b/kernel/rtmutex.c
74899@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt_mutex *lock)
74900 */
74901 spin_lock_irqsave(&pendowner->pi_lock, flags);
74902
74903- WARN_ON(!pendowner->pi_blocked_on);
74904+ BUG_ON(!pendowner->pi_blocked_on);
74905 WARN_ON(pendowner->pi_blocked_on != waiter);
74906 WARN_ON(pendowner->pi_blocked_on->lock != lock);
74907
74908diff --git a/kernel/sched.c b/kernel/sched.c
74909index 0591df8..e3af3a4 100644
74910--- a/kernel/sched.c
74911+++ b/kernel/sched.c
74912@@ -5043,7 +5043,7 @@ out:
74913 * In CONFIG_NO_HZ case, the idle load balance owner will do the
74914 * rebalancing for all the cpus for whom scheduler ticks are stopped.
74915 */
74916-static void run_rebalance_domains(struct softirq_action *h)
74917+static void run_rebalance_domains(void)
74918 {
74919 int this_cpu = smp_processor_id();
74920 struct rq *this_rq = cpu_rq(this_cpu);
74921@@ -5690,6 +5690,19 @@ pick_next_task(struct rq *rq)
74922 }
74923 }
74924
74925+#ifdef CONFIG_GRKERNSEC_SETXID
74926+extern void gr_delayed_cred_worker(void);
74927+static inline void gr_cred_schedule(void)
74928+{
74929+ if (unlikely(current->delayed_cred))
74930+ gr_delayed_cred_worker();
74931+}
74932+#else
74933+static inline void gr_cred_schedule(void)
74934+{
74935+}
74936+#endif
74937+
74938 /*
74939 * schedule() is the main scheduler function.
74940 */
74941@@ -5700,6 +5713,8 @@ asmlinkage void __sched schedule(void)
74942 struct rq *rq;
74943 int cpu;
74944
74945+ pax_track_stack();
74946+
74947 need_resched:
74948 preempt_disable();
74949 cpu = smp_processor_id();
74950@@ -5713,6 +5728,8 @@ need_resched_nonpreemptible:
74951
74952 schedule_debug(prev);
74953
74954+ gr_cred_schedule();
74955+
74956 if (sched_feat(HRTICK))
74957 hrtick_clear(rq);
74958
74959@@ -5770,7 +5787,7 @@ EXPORT_SYMBOL(schedule);
74960 * Look out! "owner" is an entirely speculative pointer
74961 * access and not reliable.
74962 */
74963-int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
74964+int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner)
74965 {
74966 unsigned int cpu;
74967 struct rq *rq;
74968@@ -5784,10 +5801,10 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
74969 * DEBUG_PAGEALLOC could have unmapped it if
74970 * the mutex owner just released it and exited.
74971 */
74972- if (probe_kernel_address(&owner->cpu, cpu))
74973+ if (probe_kernel_address(&task_thread_info(owner)->cpu, cpu))
74974 return 0;
74975 #else
74976- cpu = owner->cpu;
74977+ cpu = task_thread_info(owner)->cpu;
74978 #endif
74979
74980 /*
74981@@ -5816,7 +5833,7 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
74982 /*
74983 * Is that owner really running on that cpu?
74984 */
74985- if (task_thread_info(rq->curr) != owner || need_resched())
74986+ if (rq->curr != owner || need_resched())
74987 return 0;
74988
74989 cpu_relax();
74990@@ -6359,6 +6376,8 @@ int can_nice(const struct task_struct *p, const int nice)
74991 /* convert nice value [19,-20] to rlimit style value [1,40] */
74992 int nice_rlim = 20 - nice;
74993
74994+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
74995+
74996 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
74997 capable(CAP_SYS_NICE));
74998 }
74999@@ -6392,7 +6411,8 @@ SYSCALL_DEFINE1(nice, int, increment)
75000 if (nice > 19)
75001 nice = 19;
75002
75003- if (increment < 0 && !can_nice(current, nice))
75004+ if (increment < 0 && (!can_nice(current, nice) ||
75005+ gr_handle_chroot_nice()))
75006 return -EPERM;
75007
75008 retval = security_task_setnice(current, nice);
75009@@ -8774,7 +8794,7 @@ static void init_sched_groups_power(int cpu, struct sched_domain *sd)
75010 long power;
75011 int weight;
75012
75013- WARN_ON(!sd || !sd->groups);
75014+ BUG_ON(!sd || !sd->groups);
75015
75016 if (cpu != group_first_cpu(sd->groups))
75017 return;
75018diff --git a/kernel/signal.c b/kernel/signal.c
75019index 2494827..cda80a0 100644
75020--- a/kernel/signal.c
75021+++ b/kernel/signal.c
75022@@ -41,12 +41,12 @@
75023
75024 static struct kmem_cache *sigqueue_cachep;
75025
75026-static void __user *sig_handler(struct task_struct *t, int sig)
75027+static __sighandler_t sig_handler(struct task_struct *t, int sig)
75028 {
75029 return t->sighand->action[sig - 1].sa.sa_handler;
75030 }
75031
75032-static int sig_handler_ignored(void __user *handler, int sig)
75033+static int sig_handler_ignored(__sighandler_t handler, int sig)
75034 {
75035 /* Is it explicitly or implicitly ignored? */
75036 return handler == SIG_IGN ||
75037@@ -56,7 +56,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
75038 static int sig_task_ignored(struct task_struct *t, int sig,
75039 int from_ancestor_ns)
75040 {
75041- void __user *handler;
75042+ __sighandler_t handler;
75043
75044 handler = sig_handler(t, sig);
75045
75046@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc(struct task_struct *t, gfp_t flags,
75047 */
75048 user = get_uid(__task_cred(t)->user);
75049 atomic_inc(&user->sigpending);
75050+
75051+ if (!override_rlimit)
75052+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
75053 if (override_rlimit ||
75054 atomic_read(&user->sigpending) <=
75055 t->signal->rlim[RLIMIT_SIGPENDING].rlim_cur)
75056@@ -327,7 +330,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
75057
75058 int unhandled_signal(struct task_struct *tsk, int sig)
75059 {
75060- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
75061+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
75062 if (is_global_init(tsk))
75063 return 1;
75064 if (handler != SIG_IGN && handler != SIG_DFL)
75065@@ -627,6 +630,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
75066 }
75067 }
75068
75069+ /* allow glibc communication via tgkill to other threads in our
75070+ thread group */
75071+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
75072+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
75073+ && gr_handle_signal(t, sig))
75074+ return -EPERM;
75075+
75076 return security_task_kill(t, info, sig, 0);
75077 }
75078
75079@@ -968,7 +978,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
75080 return send_signal(sig, info, p, 1);
75081 }
75082
75083-static int
75084+int
75085 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
75086 {
75087 return send_signal(sig, info, t, 0);
75088@@ -1005,6 +1015,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
75089 unsigned long int flags;
75090 int ret, blocked, ignored;
75091 struct k_sigaction *action;
75092+ int is_unhandled = 0;
75093
75094 spin_lock_irqsave(&t->sighand->siglock, flags);
75095 action = &t->sighand->action[sig-1];
75096@@ -1019,9 +1030,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
75097 }
75098 if (action->sa.sa_handler == SIG_DFL)
75099 t->signal->flags &= ~SIGNAL_UNKILLABLE;
75100+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
75101+ is_unhandled = 1;
75102 ret = specific_send_sig_info(sig, info, t);
75103 spin_unlock_irqrestore(&t->sighand->siglock, flags);
75104
75105+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
75106+ normal operation */
75107+ if (is_unhandled) {
75108+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
75109+ gr_handle_crash(t, sig);
75110+ }
75111+
75112 return ret;
75113 }
75114
75115@@ -1081,8 +1101,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
75116 {
75117 int ret = check_kill_permission(sig, info, p);
75118
75119- if (!ret && sig)
75120+ if (!ret && sig) {
75121 ret = do_send_sig_info(sig, info, p, true);
75122+ if (!ret)
75123+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
75124+ }
75125
75126 return ret;
75127 }
75128@@ -1644,6 +1667,8 @@ void ptrace_notify(int exit_code)
75129 {
75130 siginfo_t info;
75131
75132+ pax_track_stack();
75133+
75134 BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP);
75135
75136 memset(&info, 0, sizeof info);
75137@@ -2275,7 +2300,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
75138 int error = -ESRCH;
75139
75140 rcu_read_lock();
75141- p = find_task_by_vpid(pid);
75142+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
75143+ /* allow glibc communication via tgkill to other threads in our
75144+ thread group */
75145+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
75146+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
75147+ p = find_task_by_vpid_unrestricted(pid);
75148+ else
75149+#endif
75150+ p = find_task_by_vpid(pid);
75151 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
75152 error = check_kill_permission(sig, info, p);
75153 /*
75154diff --git a/kernel/smp.c b/kernel/smp.c
75155index aa9cff3..631a0de 100644
75156--- a/kernel/smp.c
75157+++ b/kernel/smp.c
75158@@ -522,22 +522,22 @@ int smp_call_function(void (*func)(void *), void *info, int wait)
75159 }
75160 EXPORT_SYMBOL(smp_call_function);
75161
75162-void ipi_call_lock(void)
75163+void ipi_call_lock(void) __acquires(call_function.lock)
75164 {
75165 spin_lock(&call_function.lock);
75166 }
75167
75168-void ipi_call_unlock(void)
75169+void ipi_call_unlock(void) __releases(call_function.lock)
75170 {
75171 spin_unlock(&call_function.lock);
75172 }
75173
75174-void ipi_call_lock_irq(void)
75175+void ipi_call_lock_irq(void) __acquires(call_function.lock)
75176 {
75177 spin_lock_irq(&call_function.lock);
75178 }
75179
75180-void ipi_call_unlock_irq(void)
75181+void ipi_call_unlock_irq(void) __releases(call_function.lock)
75182 {
75183 spin_unlock_irq(&call_function.lock);
75184 }
75185diff --git a/kernel/softirq.c b/kernel/softirq.c
75186index 04a0252..580c512 100644
75187--- a/kernel/softirq.c
75188+++ b/kernel/softirq.c
75189@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
75190
75191 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
75192
75193-char *softirq_to_name[NR_SOFTIRQS] = {
75194+const char * const softirq_to_name[NR_SOFTIRQS] = {
75195 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
75196 "TASKLET", "SCHED", "HRTIMER", "RCU"
75197 };
75198@@ -206,7 +206,7 @@ EXPORT_SYMBOL(local_bh_enable_ip);
75199
75200 asmlinkage void __do_softirq(void)
75201 {
75202- struct softirq_action *h;
75203+ const struct softirq_action *h;
75204 __u32 pending;
75205 int max_restart = MAX_SOFTIRQ_RESTART;
75206 int cpu;
75207@@ -233,7 +233,7 @@ restart:
75208 kstat_incr_softirqs_this_cpu(h - softirq_vec);
75209
75210 trace_softirq_entry(h, softirq_vec);
75211- h->action(h);
75212+ h->action();
75213 trace_softirq_exit(h, softirq_vec);
75214 if (unlikely(prev_count != preempt_count())) {
75215 printk(KERN_ERR "huh, entered softirq %td %s %p"
75216@@ -363,9 +363,11 @@ void raise_softirq(unsigned int nr)
75217 local_irq_restore(flags);
75218 }
75219
75220-void open_softirq(int nr, void (*action)(struct softirq_action *))
75221+void open_softirq(int nr, void (*action)(void))
75222 {
75223- softirq_vec[nr].action = action;
75224+ pax_open_kernel();
75225+ *(void **)&softirq_vec[nr].action = action;
75226+ pax_close_kernel();
75227 }
75228
75229 /*
75230@@ -419,7 +421,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
75231
75232 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
75233
75234-static void tasklet_action(struct softirq_action *a)
75235+static void tasklet_action(void)
75236 {
75237 struct tasklet_struct *list;
75238
75239@@ -454,7 +456,7 @@ static void tasklet_action(struct softirq_action *a)
75240 }
75241 }
75242
75243-static void tasklet_hi_action(struct softirq_action *a)
75244+static void tasklet_hi_action(void)
75245 {
75246 struct tasklet_struct *list;
75247
75248diff --git a/kernel/sys.c b/kernel/sys.c
75249index e9512b1..f07185f 100644
75250--- a/kernel/sys.c
75251+++ b/kernel/sys.c
75252@@ -133,6 +133,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
75253 error = -EACCES;
75254 goto out;
75255 }
75256+
75257+ if (gr_handle_chroot_setpriority(p, niceval)) {
75258+ error = -EACCES;
75259+ goto out;
75260+ }
75261+
75262 no_nice = security_task_setnice(p, niceval);
75263 if (no_nice) {
75264 error = no_nice;
75265@@ -190,10 +196,10 @@ SYSCALL_DEFINE3(setpriority, int, which, int, who, int, niceval)
75266 !(user = find_user(who)))
75267 goto out_unlock; /* No processes for this user */
75268
75269- do_each_thread(g, p)
75270+ do_each_thread(g, p) {
75271 if (__task_cred(p)->uid == who)
75272 error = set_one_prio(p, niceval, error);
75273- while_each_thread(g, p);
75274+ } while_each_thread(g, p);
75275 if (who != cred->uid)
75276 free_uid(user); /* For find_user() */
75277 break;
75278@@ -253,13 +259,13 @@ SYSCALL_DEFINE2(getpriority, int, which, int, who)
75279 !(user = find_user(who)))
75280 goto out_unlock; /* No processes for this user */
75281
75282- do_each_thread(g, p)
75283+ do_each_thread(g, p) {
75284 if (__task_cred(p)->uid == who) {
75285 niceval = 20 - task_nice(p);
75286 if (niceval > retval)
75287 retval = niceval;
75288 }
75289- while_each_thread(g, p);
75290+ } while_each_thread(g, p);
75291 if (who != cred->uid)
75292 free_uid(user); /* for find_user() */
75293 break;
75294@@ -509,6 +515,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
75295 goto error;
75296 }
75297
75298+ if (gr_check_group_change(new->gid, new->egid, -1))
75299+ goto error;
75300+
75301 if (rgid != (gid_t) -1 ||
75302 (egid != (gid_t) -1 && egid != old->gid))
75303 new->sgid = new->egid;
75304@@ -542,6 +551,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
75305 goto error;
75306
75307 retval = -EPERM;
75308+
75309+ if (gr_check_group_change(gid, gid, gid))
75310+ goto error;
75311+
75312 if (capable(CAP_SETGID))
75313 new->gid = new->egid = new->sgid = new->fsgid = gid;
75314 else if (gid == old->gid || gid == old->sgid)
75315@@ -559,7 +572,7 @@ error:
75316 /*
75317 * change the user struct in a credentials set to match the new UID
75318 */
75319-static int set_user(struct cred *new)
75320+int set_user(struct cred *new)
75321 {
75322 struct user_struct *new_user;
75323
75324@@ -567,12 +580,19 @@ static int set_user(struct cred *new)
75325 if (!new_user)
75326 return -EAGAIN;
75327
75328+ /*
75329+ * We don't fail in case of NPROC limit excess here because too many
75330+ * poorly written programs don't check set*uid() return code, assuming
75331+ * it never fails if called by root. We may still enforce NPROC limit
75332+ * for programs doing set*uid()+execve() by harmlessly deferring the
75333+ * failure to the execve() stage.
75334+ */
75335 if (atomic_read(&new_user->processes) >=
75336 current->signal->rlim[RLIMIT_NPROC].rlim_cur &&
75337- new_user != INIT_USER) {
75338- free_uid(new_user);
75339- return -EAGAIN;
75340- }
75341+ new_user != INIT_USER)
75342+ current->flags |= PF_NPROC_EXCEEDED;
75343+ else
75344+ current->flags &= ~PF_NPROC_EXCEEDED;
75345
75346 free_uid(new->user);
75347 new->user = new_user;
75348@@ -627,6 +647,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
75349 goto error;
75350 }
75351
75352+ if (gr_check_user_change(new->uid, new->euid, -1))
75353+ goto error;
75354+
75355 if (new->uid != old->uid) {
75356 retval = set_user(new);
75357 if (retval < 0)
75358@@ -675,6 +698,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
75359 goto error;
75360
75361 retval = -EPERM;
75362+
75363+ if (gr_check_crash_uid(uid))
75364+ goto error;
75365+ if (gr_check_user_change(uid, uid, uid))
75366+ goto error;
75367+
75368 if (capable(CAP_SETUID)) {
75369 new->suid = new->uid = uid;
75370 if (uid != old->uid) {
75371@@ -732,6 +761,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
75372 goto error;
75373 }
75374
75375+ if (gr_check_user_change(ruid, euid, -1))
75376+ goto error;
75377+
75378 if (ruid != (uid_t) -1) {
75379 new->uid = ruid;
75380 if (ruid != old->uid) {
75381@@ -800,6 +832,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
75382 goto error;
75383 }
75384
75385+ if (gr_check_group_change(rgid, egid, -1))
75386+ goto error;
75387+
75388 if (rgid != (gid_t) -1)
75389 new->gid = rgid;
75390 if (egid != (gid_t) -1)
75391@@ -849,6 +884,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
75392 if (security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_FS) < 0)
75393 goto error;
75394
75395+ if (gr_check_user_change(-1, -1, uid))
75396+ goto error;
75397+
75398 if (uid == old->uid || uid == old->euid ||
75399 uid == old->suid || uid == old->fsuid ||
75400 capable(CAP_SETUID)) {
75401@@ -889,6 +927,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
75402 if (gid == old->gid || gid == old->egid ||
75403 gid == old->sgid || gid == old->fsgid ||
75404 capable(CAP_SETGID)) {
75405+ if (gr_check_group_change(-1, -1, gid))
75406+ goto error;
75407+
75408 if (gid != old_fsgid) {
75409 new->fsgid = gid;
75410 goto change_okay;
75411@@ -1454,7 +1495,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
75412 error = get_dumpable(me->mm);
75413 break;
75414 case PR_SET_DUMPABLE:
75415- if (arg2 < 0 || arg2 > 1) {
75416+ if (arg2 > 1) {
75417 error = -EINVAL;
75418 break;
75419 }
75420diff --git a/kernel/sysctl.c b/kernel/sysctl.c
75421index b8bd058..ab6a76be 100644
75422--- a/kernel/sysctl.c
75423+++ b/kernel/sysctl.c
75424@@ -63,6 +63,13 @@
75425 static int deprecated_sysctl_warning(struct __sysctl_args *args);
75426
75427 #if defined(CONFIG_SYSCTL)
75428+#include <linux/grsecurity.h>
75429+#include <linux/grinternal.h>
75430+
75431+extern __u32 gr_handle_sysctl(const ctl_table *table, const int op);
75432+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
75433+ const int op);
75434+extern int gr_handle_chroot_sysctl(const int op);
75435
75436 /* External variables not in a header file. */
75437 extern int C_A_D;
75438@@ -168,6 +175,7 @@ static int proc_do_cad_pid(struct ctl_table *table, int write,
75439 static int proc_taint(struct ctl_table *table, int write,
75440 void __user *buffer, size_t *lenp, loff_t *ppos);
75441 #endif
75442+extern ctl_table grsecurity_table[];
75443
75444 static struct ctl_table root_table[];
75445 static struct ctl_table_root sysctl_table_root;
75446@@ -200,6 +208,21 @@ extern struct ctl_table epoll_table[];
75447 int sysctl_legacy_va_layout;
75448 #endif
75449
75450+#ifdef CONFIG_PAX_SOFTMODE
75451+static ctl_table pax_table[] = {
75452+ {
75453+ .ctl_name = CTL_UNNUMBERED,
75454+ .procname = "softmode",
75455+ .data = &pax_softmode,
75456+ .maxlen = sizeof(unsigned int),
75457+ .mode = 0600,
75458+ .proc_handler = &proc_dointvec,
75459+ },
75460+
75461+ { .ctl_name = 0 }
75462+};
75463+#endif
75464+
75465 extern int prove_locking;
75466 extern int lock_stat;
75467
75468@@ -251,6 +274,24 @@ static int max_wakeup_granularity_ns = NSEC_PER_SEC; /* 1 second */
75469 #endif
75470
75471 static struct ctl_table kern_table[] = {
75472+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
75473+ {
75474+ .ctl_name = CTL_UNNUMBERED,
75475+ .procname = "grsecurity",
75476+ .mode = 0500,
75477+ .child = grsecurity_table,
75478+ },
75479+#endif
75480+
75481+#ifdef CONFIG_PAX_SOFTMODE
75482+ {
75483+ .ctl_name = CTL_UNNUMBERED,
75484+ .procname = "pax",
75485+ .mode = 0500,
75486+ .child = pax_table,
75487+ },
75488+#endif
75489+
75490 {
75491 .ctl_name = CTL_UNNUMBERED,
75492 .procname = "sched_child_runs_first",
75493@@ -567,8 +608,8 @@ static struct ctl_table kern_table[] = {
75494 .data = &modprobe_path,
75495 .maxlen = KMOD_PATH_LEN,
75496 .mode = 0644,
75497- .proc_handler = &proc_dostring,
75498- .strategy = &sysctl_string,
75499+ .proc_handler = &proc_dostring_modpriv,
75500+ .strategy = &sysctl_string_modpriv,
75501 },
75502 {
75503 .ctl_name = CTL_UNNUMBERED,
75504@@ -1247,6 +1288,13 @@ static struct ctl_table vm_table[] = {
75505 .mode = 0644,
75506 .proc_handler = &proc_dointvec
75507 },
75508+ {
75509+ .procname = "heap_stack_gap",
75510+ .data = &sysctl_heap_stack_gap,
75511+ .maxlen = sizeof(sysctl_heap_stack_gap),
75512+ .mode = 0644,
75513+ .proc_handler = proc_doulongvec_minmax,
75514+ },
75515 #else
75516 {
75517 .ctl_name = CTL_UNNUMBERED,
75518@@ -1803,6 +1851,8 @@ static int do_sysctl_strategy(struct ctl_table_root *root,
75519 return 0;
75520 }
75521
75522+static int sysctl_perm_nochk(struct ctl_table_root *root, struct ctl_table *table, int op);
75523+
75524 static int parse_table(int __user *name, int nlen,
75525 void __user *oldval, size_t __user *oldlenp,
75526 void __user *newval, size_t newlen,
75527@@ -1821,7 +1871,7 @@ repeat:
75528 if (n == table->ctl_name) {
75529 int error;
75530 if (table->child) {
75531- if (sysctl_perm(root, table, MAY_EXEC))
75532+ if (sysctl_perm_nochk(root, table, MAY_EXEC))
75533 return -EPERM;
75534 name++;
75535 nlen--;
75536@@ -1906,6 +1956,33 @@ int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
75537 int error;
75538 int mode;
75539
75540+ if (table->parent != NULL && table->parent->procname != NULL &&
75541+ table->procname != NULL &&
75542+ gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
75543+ return -EACCES;
75544+ if (gr_handle_chroot_sysctl(op))
75545+ return -EACCES;
75546+ error = gr_handle_sysctl(table, op);
75547+ if (error)
75548+ return error;
75549+
75550+ error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
75551+ if (error)
75552+ return error;
75553+
75554+ if (root->permissions)
75555+ mode = root->permissions(root, current->nsproxy, table);
75556+ else
75557+ mode = table->mode;
75558+
75559+ return test_perm(mode, op);
75560+}
75561+
75562+int sysctl_perm_nochk(struct ctl_table_root *root, struct ctl_table *table, int op)
75563+{
75564+ int error;
75565+ int mode;
75566+
75567 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
75568 if (error)
75569 return error;
75570@@ -2335,6 +2412,16 @@ int proc_dostring(struct ctl_table *table, int write,
75571 buffer, lenp, ppos);
75572 }
75573
75574+int proc_dostring_modpriv(struct ctl_table *table, int write,
75575+ void __user *buffer, size_t *lenp, loff_t *ppos)
75576+{
75577+ if (write && !capable(CAP_SYS_MODULE))
75578+ return -EPERM;
75579+
75580+ return _proc_do_string(table->data, table->maxlen, write,
75581+ buffer, lenp, ppos);
75582+}
75583+
75584
75585 static int do_proc_dointvec_conv(int *negp, unsigned long *lvalp,
75586 int *valp,
75587@@ -2609,7 +2696,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
75588 vleft = table->maxlen / sizeof(unsigned long);
75589 left = *lenp;
75590
75591- for (; left && vleft--; i++, min++, max++, first=0) {
75592+ for (; left && vleft--; i++, first=0) {
75593 if (write) {
75594 while (left) {
75595 char c;
75596@@ -2910,6 +2997,12 @@ int proc_dostring(struct ctl_table *table, int write,
75597 return -ENOSYS;
75598 }
75599
75600+int proc_dostring_modpriv(struct ctl_table *table, int write,
75601+ void __user *buffer, size_t *lenp, loff_t *ppos)
75602+{
75603+ return -ENOSYS;
75604+}
75605+
75606 int proc_dointvec(struct ctl_table *table, int write,
75607 void __user *buffer, size_t *lenp, loff_t *ppos)
75608 {
75609@@ -3038,6 +3131,16 @@ int sysctl_string(struct ctl_table *table,
75610 return 1;
75611 }
75612
75613+int sysctl_string_modpriv(struct ctl_table *table,
75614+ void __user *oldval, size_t __user *oldlenp,
75615+ void __user *newval, size_t newlen)
75616+{
75617+ if (newval && newlen && !capable(CAP_SYS_MODULE))
75618+ return -EPERM;
75619+
75620+ return sysctl_string(table, oldval, oldlenp, newval, newlen);
75621+}
75622+
75623 /*
75624 * This function makes sure that all of the integers in the vector
75625 * are between the minimum and maximum values given in the arrays
75626@@ -3182,6 +3285,13 @@ int sysctl_string(struct ctl_table *table,
75627 return -ENOSYS;
75628 }
75629
75630+int sysctl_string_modpriv(struct ctl_table *table,
75631+ void __user *oldval, size_t __user *oldlenp,
75632+ void __user *newval, size_t newlen)
75633+{
75634+ return -ENOSYS;
75635+}
75636+
75637 int sysctl_intvec(struct ctl_table *table,
75638 void __user *oldval, size_t __user *oldlenp,
75639 void __user *newval, size_t newlen)
75640@@ -3246,6 +3356,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
75641 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
75642 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
75643 EXPORT_SYMBOL(proc_dostring);
75644+EXPORT_SYMBOL(proc_dostring_modpriv);
75645 EXPORT_SYMBOL(proc_doulongvec_minmax);
75646 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
75647 EXPORT_SYMBOL(register_sysctl_table);
75648@@ -3254,5 +3365,6 @@ EXPORT_SYMBOL(sysctl_intvec);
75649 EXPORT_SYMBOL(sysctl_jiffies);
75650 EXPORT_SYMBOL(sysctl_ms_jiffies);
75651 EXPORT_SYMBOL(sysctl_string);
75652+EXPORT_SYMBOL(sysctl_string_modpriv);
75653 EXPORT_SYMBOL(sysctl_data);
75654 EXPORT_SYMBOL(unregister_sysctl_table);
75655diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
75656index 469193c..ea3ecb2 100644
75657--- a/kernel/sysctl_check.c
75658+++ b/kernel/sysctl_check.c
75659@@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
75660 } else {
75661 if ((table->strategy == sysctl_data) ||
75662 (table->strategy == sysctl_string) ||
75663+ (table->strategy == sysctl_string_modpriv) ||
75664 (table->strategy == sysctl_intvec) ||
75665 (table->strategy == sysctl_jiffies) ||
75666 (table->strategy == sysctl_ms_jiffies) ||
75667 (table->proc_handler == proc_dostring) ||
75668+ (table->proc_handler == proc_dostring_modpriv) ||
75669 (table->proc_handler == proc_dointvec) ||
75670 (table->proc_handler == proc_dointvec_minmax) ||
75671 (table->proc_handler == proc_dointvec_jiffies) ||
75672diff --git a/kernel/taskstats.c b/kernel/taskstats.c
75673index a4ef542..798bcd7 100644
75674--- a/kernel/taskstats.c
75675+++ b/kernel/taskstats.c
75676@@ -26,9 +26,12 @@
75677 #include <linux/cgroup.h>
75678 #include <linux/fs.h>
75679 #include <linux/file.h>
75680+#include <linux/grsecurity.h>
75681 #include <net/genetlink.h>
75682 #include <asm/atomic.h>
75683
75684+extern int gr_is_taskstats_denied(int pid);
75685+
75686 /*
75687 * Maximum length of a cpumask that can be specified in
75688 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
75689@@ -442,6 +445,9 @@ static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
75690 size_t size;
75691 cpumask_var_t mask;
75692
75693+ if (gr_is_taskstats_denied(current->pid))
75694+ return -EACCES;
75695+
75696 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
75697 return -ENOMEM;
75698
75699diff --git a/kernel/time.c b/kernel/time.c
75700index 33df60e..ca768bd 100644
75701--- a/kernel/time.c
75702+++ b/kernel/time.c
75703@@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec *tv, struct timezone *tz)
75704 return error;
75705
75706 if (tz) {
75707+ /* we log in do_settimeofday called below, so don't log twice
75708+ */
75709+ if (!tv)
75710+ gr_log_timechange();
75711+
75712 /* SMP safe, global irq locking makes it work. */
75713 sys_tz = *tz;
75714 update_vsyscall_tz();
75715@@ -240,7 +245,7 @@ EXPORT_SYMBOL(current_fs_time);
75716 * Avoid unnecessary multiplications/divisions in the
75717 * two most common HZ cases:
75718 */
75719-unsigned int inline jiffies_to_msecs(const unsigned long j)
75720+inline unsigned int jiffies_to_msecs(const unsigned long j)
75721 {
75722 #if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)
75723 return (MSEC_PER_SEC / HZ) * j;
75724@@ -256,7 +261,7 @@ unsigned int inline jiffies_to_msecs(const unsigned long j)
75725 }
75726 EXPORT_SYMBOL(jiffies_to_msecs);
75727
75728-unsigned int inline jiffies_to_usecs(const unsigned long j)
75729+inline unsigned int jiffies_to_usecs(const unsigned long j)
75730 {
75731 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
75732 return (USEC_PER_SEC / HZ) * j;
75733diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
75734index 57b953f..06f149f 100644
75735--- a/kernel/time/tick-broadcast.c
75736+++ b/kernel/time/tick-broadcast.c
75737@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
75738 * then clear the broadcast bit.
75739 */
75740 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
75741- int cpu = smp_processor_id();
75742+ cpu = smp_processor_id();
75743
75744 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
75745 tick_broadcast_clear_oneshot(cpu);
75746diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
75747index 4a71cff..ffb5548 100644
75748--- a/kernel/time/timekeeping.c
75749+++ b/kernel/time/timekeeping.c
75750@@ -14,6 +14,7 @@
75751 #include <linux/init.h>
75752 #include <linux/mm.h>
75753 #include <linux/sched.h>
75754+#include <linux/grsecurity.h>
75755 #include <linux/sysdev.h>
75756 #include <linux/clocksource.h>
75757 #include <linux/jiffies.h>
75758@@ -180,7 +181,7 @@ void update_xtime_cache(u64 nsec)
75759 */
75760 struct timespec ts = xtime;
75761 timespec_add_ns(&ts, nsec);
75762- ACCESS_ONCE(xtime_cache) = ts;
75763+ ACCESS_ONCE_RW(xtime_cache) = ts;
75764 }
75765
75766 /* must hold xtime_lock */
75767@@ -337,6 +338,8 @@ int do_settimeofday(struct timespec *tv)
75768 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
75769 return -EINVAL;
75770
75771+ gr_log_timechange();
75772+
75773 write_seqlock_irqsave(&xtime_lock, flags);
75774
75775 timekeeping_forward_now();
75776diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
75777index 54c0dda..e9095d9 100644
75778--- a/kernel/time/timer_list.c
75779+++ b/kernel/time/timer_list.c
75780@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
75781
75782 static void print_name_offset(struct seq_file *m, void *sym)
75783 {
75784+#ifdef CONFIG_GRKERNSEC_HIDESYM
75785+ SEQ_printf(m, "<%p>", NULL);
75786+#else
75787 char symname[KSYM_NAME_LEN];
75788
75789 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
75790 SEQ_printf(m, "<%p>", sym);
75791 else
75792 SEQ_printf(m, "%s", symname);
75793+#endif
75794 }
75795
75796 static void
75797@@ -112,7 +116,11 @@ next_one:
75798 static void
75799 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
75800 {
75801+#ifdef CONFIG_GRKERNSEC_HIDESYM
75802+ SEQ_printf(m, " .base: %p\n", NULL);
75803+#else
75804 SEQ_printf(m, " .base: %p\n", base);
75805+#endif
75806 SEQ_printf(m, " .index: %d\n",
75807 base->index);
75808 SEQ_printf(m, " .resolution: %Lu nsecs\n",
75809@@ -289,7 +297,11 @@ static int __init init_timer_list_procfs(void)
75810 {
75811 struct proc_dir_entry *pe;
75812
75813+#ifdef CONFIG_GRKERNSEC_PROC_ADD
75814+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
75815+#else
75816 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
75817+#endif
75818 if (!pe)
75819 return -ENOMEM;
75820 return 0;
75821diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
75822index ee5681f..634089b 100644
75823--- a/kernel/time/timer_stats.c
75824+++ b/kernel/time/timer_stats.c
75825@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
75826 static unsigned long nr_entries;
75827 static struct entry entries[MAX_ENTRIES];
75828
75829-static atomic_t overflow_count;
75830+static atomic_unchecked_t overflow_count;
75831
75832 /*
75833 * The entries are in a hash-table, for fast lookup:
75834@@ -140,7 +140,7 @@ static void reset_entries(void)
75835 nr_entries = 0;
75836 memset(entries, 0, sizeof(entries));
75837 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
75838- atomic_set(&overflow_count, 0);
75839+ atomic_set_unchecked(&overflow_count, 0);
75840 }
75841
75842 static struct entry *alloc_entry(void)
75843@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
75844 if (likely(entry))
75845 entry->count++;
75846 else
75847- atomic_inc(&overflow_count);
75848+ atomic_inc_unchecked(&overflow_count);
75849
75850 out_unlock:
75851 spin_unlock_irqrestore(lock, flags);
75852@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
75853
75854 static void print_name_offset(struct seq_file *m, unsigned long addr)
75855 {
75856+#ifdef CONFIG_GRKERNSEC_HIDESYM
75857+ seq_printf(m, "<%p>", NULL);
75858+#else
75859 char symname[KSYM_NAME_LEN];
75860
75861 if (lookup_symbol_name(addr, symname) < 0)
75862 seq_printf(m, "<%p>", (void *)addr);
75863 else
75864 seq_printf(m, "%s", symname);
75865+#endif
75866 }
75867
75868 static int tstats_show(struct seq_file *m, void *v)
75869@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
75870
75871 seq_puts(m, "Timer Stats Version: v0.2\n");
75872 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
75873- if (atomic_read(&overflow_count))
75874+ if (atomic_read_unchecked(&overflow_count))
75875 seq_printf(m, "Overflow: %d entries\n",
75876- atomic_read(&overflow_count));
75877+ atomic_read_unchecked(&overflow_count));
75878
75879 for (i = 0; i < nr_entries; i++) {
75880 entry = entries + i;
75881@@ -415,7 +419,11 @@ static int __init init_tstats_procfs(void)
75882 {
75883 struct proc_dir_entry *pe;
75884
75885+#ifdef CONFIG_GRKERNSEC_PROC_ADD
75886+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
75887+#else
75888 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
75889+#endif
75890 if (!pe)
75891 return -ENOMEM;
75892 return 0;
75893diff --git a/kernel/timer.c b/kernel/timer.c
75894index cb3c1f1..8bf5526 100644
75895--- a/kernel/timer.c
75896+++ b/kernel/timer.c
75897@@ -1213,7 +1213,7 @@ void update_process_times(int user_tick)
75898 /*
75899 * This function runs timers and the timer-tq in bottom half context.
75900 */
75901-static void run_timer_softirq(struct softirq_action *h)
75902+static void run_timer_softirq(void)
75903 {
75904 struct tvec_base *base = __get_cpu_var(tvec_bases);
75905
75906diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
75907index d9d6206..f19467e 100644
75908--- a/kernel/trace/blktrace.c
75909+++ b/kernel/trace/blktrace.c
75910@@ -313,7 +313,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
75911 struct blk_trace *bt = filp->private_data;
75912 char buf[16];
75913
75914- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
75915+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
75916
75917 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
75918 }
75919@@ -376,7 +376,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
75920 return 1;
75921
75922 bt = buf->chan->private_data;
75923- atomic_inc(&bt->dropped);
75924+ atomic_inc_unchecked(&bt->dropped);
75925 return 0;
75926 }
75927
75928@@ -477,7 +477,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
75929
75930 bt->dir = dir;
75931 bt->dev = dev;
75932- atomic_set(&bt->dropped, 0);
75933+ atomic_set_unchecked(&bt->dropped, 0);
75934
75935 ret = -EIO;
75936 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
75937diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
75938index 4872937..c794d40 100644
75939--- a/kernel/trace/ftrace.c
75940+++ b/kernel/trace/ftrace.c
75941@@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
75942
75943 ip = rec->ip;
75944
75945+ ret = ftrace_arch_code_modify_prepare();
75946+ FTRACE_WARN_ON(ret);
75947+ if (ret)
75948+ return 0;
75949+
75950 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
75951+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
75952 if (ret) {
75953 ftrace_bug(ret, ip);
75954 rec->flags |= FTRACE_FL_FAILED;
75955- return 0;
75956 }
75957- return 1;
75958+ return ret ? 0 : 1;
75959 }
75960
75961 /*
75962diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
75963index e749a05..19c6e94 100644
75964--- a/kernel/trace/ring_buffer.c
75965+++ b/kernel/trace/ring_buffer.c
75966@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(struct list_head *list)
75967 * the reader page). But if the next page is a header page,
75968 * its flags will be non zero.
75969 */
75970-static int inline
75971+static inline int
75972 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
75973 struct buffer_page *page, struct list_head *list)
75974 {
75975diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
75976index a2a2d1f..7f32b09 100644
75977--- a/kernel/trace/trace.c
75978+++ b/kernel/trace/trace.c
75979@@ -3193,6 +3193,8 @@ static ssize_t tracing_splice_read_pipe(struct file *filp,
75980 size_t rem;
75981 unsigned int i;
75982
75983+ pax_track_stack();
75984+
75985 /* copy the tracer to avoid using a global lock all around */
75986 mutex_lock(&trace_types_lock);
75987 if (unlikely(old_tracer != current_trace && current_trace)) {
75988@@ -3659,6 +3661,8 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
75989 int entries, size, i;
75990 size_t ret;
75991
75992+ pax_track_stack();
75993+
75994 if (*ppos & (PAGE_SIZE - 1)) {
75995 WARN_ONCE(1, "Ftrace: previous read must page-align\n");
75996 return -EINVAL;
75997@@ -3816,10 +3820,9 @@ static const struct file_operations tracing_dyn_info_fops = {
75998 };
75999 #endif
76000
76001-static struct dentry *d_tracer;
76002-
76003 struct dentry *tracing_init_dentry(void)
76004 {
76005+ static struct dentry *d_tracer;
76006 static int once;
76007
76008 if (d_tracer)
76009@@ -3839,10 +3842,9 @@ struct dentry *tracing_init_dentry(void)
76010 return d_tracer;
76011 }
76012
76013-static struct dentry *d_percpu;
76014-
76015 struct dentry *tracing_dentry_percpu(void)
76016 {
76017+ static struct dentry *d_percpu;
76018 static int once;
76019 struct dentry *d_tracer;
76020
76021diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
76022index d128f65..f37b4af 100644
76023--- a/kernel/trace/trace_events.c
76024+++ b/kernel/trace/trace_events.c
76025@@ -951,13 +951,10 @@ static LIST_HEAD(ftrace_module_file_list);
76026 * Modules must own their file_operations to keep up with
76027 * reference counting.
76028 */
76029+
76030 struct ftrace_module_file_ops {
76031 struct list_head list;
76032 struct module *mod;
76033- struct file_operations id;
76034- struct file_operations enable;
76035- struct file_operations format;
76036- struct file_operations filter;
76037 };
76038
76039 static void remove_subsystem_dir(const char *name)
76040@@ -1004,17 +1001,12 @@ trace_create_file_ops(struct module *mod)
76041
76042 file_ops->mod = mod;
76043
76044- file_ops->id = ftrace_event_id_fops;
76045- file_ops->id.owner = mod;
76046-
76047- file_ops->enable = ftrace_enable_fops;
76048- file_ops->enable.owner = mod;
76049-
76050- file_ops->filter = ftrace_event_filter_fops;
76051- file_ops->filter.owner = mod;
76052-
76053- file_ops->format = ftrace_event_format_fops;
76054- file_ops->format.owner = mod;
76055+ pax_open_kernel();
76056+ *(void **)&mod->trace_id.owner = mod;
76057+ *(void **)&mod->trace_enable.owner = mod;
76058+ *(void **)&mod->trace_filter.owner = mod;
76059+ *(void **)&mod->trace_format.owner = mod;
76060+ pax_close_kernel();
76061
76062 list_add(&file_ops->list, &ftrace_module_file_list);
76063
76064@@ -1063,8 +1055,8 @@ static void trace_module_add_events(struct module *mod)
76065 call->mod = mod;
76066 list_add(&call->list, &ftrace_events);
76067 event_create_dir(call, d_events,
76068- &file_ops->id, &file_ops->enable,
76069- &file_ops->filter, &file_ops->format);
76070+ &mod->trace_id, &mod->trace_enable,
76071+ &mod->trace_filter, &mod->trace_format);
76072 }
76073 }
76074
76075diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
76076index 0acd834..b800b56 100644
76077--- a/kernel/trace/trace_mmiotrace.c
76078+++ b/kernel/trace/trace_mmiotrace.c
76079@@ -23,7 +23,7 @@ struct header_iter {
76080 static struct trace_array *mmio_trace_array;
76081 static bool overrun_detected;
76082 static unsigned long prev_overruns;
76083-static atomic_t dropped_count;
76084+static atomic_unchecked_t dropped_count;
76085
76086 static void mmio_reset_data(struct trace_array *tr)
76087 {
76088@@ -126,7 +126,7 @@ static void mmio_close(struct trace_iterator *iter)
76089
76090 static unsigned long count_overruns(struct trace_iterator *iter)
76091 {
76092- unsigned long cnt = atomic_xchg(&dropped_count, 0);
76093+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
76094 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
76095
76096 if (over > prev_overruns)
76097@@ -316,7 +316,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
76098 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
76099 sizeof(*entry), 0, pc);
76100 if (!event) {
76101- atomic_inc(&dropped_count);
76102+ atomic_inc_unchecked(&dropped_count);
76103 return;
76104 }
76105 entry = ring_buffer_event_data(event);
76106@@ -346,7 +346,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
76107 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
76108 sizeof(*entry), 0, pc);
76109 if (!event) {
76110- atomic_inc(&dropped_count);
76111+ atomic_inc_unchecked(&dropped_count);
76112 return;
76113 }
76114 entry = ring_buffer_event_data(event);
76115diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
76116index b6c12c6..41fdc53 100644
76117--- a/kernel/trace/trace_output.c
76118+++ b/kernel/trace/trace_output.c
76119@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
76120 return 0;
76121 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
76122 if (!IS_ERR(p)) {
76123- p = mangle_path(s->buffer + s->len, p, "\n");
76124+ p = mangle_path(s->buffer + s->len, p, "\n\\");
76125 if (p) {
76126 s->len = p - s->buffer;
76127 return 1;
76128diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
76129index 8504ac7..ecf0adb 100644
76130--- a/kernel/trace/trace_stack.c
76131+++ b/kernel/trace/trace_stack.c
76132@@ -50,7 +50,7 @@ static inline void check_stack(void)
76133 return;
76134
76135 /* we do not handle interrupt stacks yet */
76136- if (!object_is_on_stack(&this_size))
76137+ if (!object_starts_on_stack(&this_size))
76138 return;
76139
76140 local_irq_save(flags);
76141diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
76142index 40cafb0..d5ead43 100644
76143--- a/kernel/trace/trace_workqueue.c
76144+++ b/kernel/trace/trace_workqueue.c
76145@@ -21,7 +21,7 @@ struct cpu_workqueue_stats {
76146 int cpu;
76147 pid_t pid;
76148 /* Can be inserted from interrupt or user context, need to be atomic */
76149- atomic_t inserted;
76150+ atomic_unchecked_t inserted;
76151 /*
76152 * Don't need to be atomic, works are serialized in a single workqueue thread
76153 * on a single CPU.
76154@@ -58,7 +58,7 @@ probe_workqueue_insertion(struct task_struct *wq_thread,
76155 spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
76156 list_for_each_entry(node, &workqueue_cpu_stat(cpu)->list, list) {
76157 if (node->pid == wq_thread->pid) {
76158- atomic_inc(&node->inserted);
76159+ atomic_inc_unchecked(&node->inserted);
76160 goto found;
76161 }
76162 }
76163@@ -205,7 +205,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
76164 tsk = get_pid_task(pid, PIDTYPE_PID);
76165 if (tsk) {
76166 seq_printf(s, "%3d %6d %6u %s\n", cws->cpu,
76167- atomic_read(&cws->inserted), cws->executed,
76168+ atomic_read_unchecked(&cws->inserted), cws->executed,
76169 tsk->comm);
76170 put_task_struct(tsk);
76171 }
76172diff --git a/kernel/user.c b/kernel/user.c
76173index 1b91701..8795237 100644
76174--- a/kernel/user.c
76175+++ b/kernel/user.c
76176@@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct user_namespace *ns, uid_t uid)
76177 spin_lock_irq(&uidhash_lock);
76178 up = uid_hash_find(uid, hashent);
76179 if (up) {
76180+ put_user_ns(ns);
76181 key_put(new->uid_keyring);
76182 key_put(new->session_keyring);
76183 kmem_cache_free(uid_cachep, new);
76184diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
76185index 234ceb1..ad74049 100644
76186--- a/lib/Kconfig.debug
76187+++ b/lib/Kconfig.debug
76188@@ -905,7 +905,7 @@ config LATENCYTOP
76189 select STACKTRACE
76190 select SCHEDSTATS
76191 select SCHED_DEBUG
76192- depends on HAVE_LATENCYTOP_SUPPORT
76193+ depends on HAVE_LATENCYTOP_SUPPORT && !GRKERNSEC_HIDESYM
76194 help
76195 Enable this option if you want to use the LatencyTOP tool
76196 to find out which userspace is blocking on what kernel operations.
76197diff --git a/lib/bitmap.c b/lib/bitmap.c
76198index 7025658..8d14cab 100644
76199--- a/lib/bitmap.c
76200+++ b/lib/bitmap.c
76201@@ -341,7 +341,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
76202 {
76203 int c, old_c, totaldigits, ndigits, nchunks, nbits;
76204 u32 chunk;
76205- const char __user *ubuf = buf;
76206+ const char __user *ubuf = (const char __force_user *)buf;
76207
76208 bitmap_zero(maskp, nmaskbits);
76209
76210@@ -426,7 +426,7 @@ int bitmap_parse_user(const char __user *ubuf,
76211 {
76212 if (!access_ok(VERIFY_READ, ubuf, ulen))
76213 return -EFAULT;
76214- return __bitmap_parse((const char *)ubuf, ulen, 1, maskp, nmaskbits);
76215+ return __bitmap_parse((const char __force_kernel *)ubuf, ulen, 1, maskp, nmaskbits);
76216 }
76217 EXPORT_SYMBOL(bitmap_parse_user);
76218
76219diff --git a/lib/bug.c b/lib/bug.c
76220index 300e41a..2779eb0 100644
76221--- a/lib/bug.c
76222+++ b/lib/bug.c
76223@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
76224 return BUG_TRAP_TYPE_NONE;
76225
76226 bug = find_bug(bugaddr);
76227+ if (!bug)
76228+ return BUG_TRAP_TYPE_NONE;
76229
76230 printk(KERN_EMERG "------------[ cut here ]------------\n");
76231
76232diff --git a/lib/debugobjects.c b/lib/debugobjects.c
76233index 2b413db..e21d207 100644
76234--- a/lib/debugobjects.c
76235+++ b/lib/debugobjects.c
76236@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
76237 if (limit > 4)
76238 return;
76239
76240- is_on_stack = object_is_on_stack(addr);
76241+ is_on_stack = object_starts_on_stack(addr);
76242 if (is_on_stack == onstack)
76243 return;
76244
76245diff --git a/lib/devres.c b/lib/devres.c
76246index 72c8909..7543868 100644
76247--- a/lib/devres.c
76248+++ b/lib/devres.c
76249@@ -80,7 +80,7 @@ void devm_iounmap(struct device *dev, void __iomem *addr)
76250 {
76251 iounmap(addr);
76252 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
76253- (void *)addr));
76254+ (void __force *)addr));
76255 }
76256 EXPORT_SYMBOL(devm_iounmap);
76257
76258@@ -140,7 +140,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
76259 {
76260 ioport_unmap(addr);
76261 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
76262- devm_ioport_map_match, (void *)addr));
76263+ devm_ioport_map_match, (void __force *)addr));
76264 }
76265 EXPORT_SYMBOL(devm_ioport_unmap);
76266
76267diff --git a/lib/dma-debug.c b/lib/dma-debug.c
76268index 084e879..0674448 100644
76269--- a/lib/dma-debug.c
76270+++ b/lib/dma-debug.c
76271@@ -861,7 +861,7 @@ out:
76272
76273 static void check_for_stack(struct device *dev, void *addr)
76274 {
76275- if (object_is_on_stack(addr))
76276+ if (object_starts_on_stack(addr))
76277 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
76278 "stack [addr=%p]\n", addr);
76279 }
76280diff --git a/lib/idr.c b/lib/idr.c
76281index eda7ba3..915dfae 100644
76282--- a/lib/idr.c
76283+++ b/lib/idr.c
76284@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
76285 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
76286
76287 /* if already at the top layer, we need to grow */
76288- if (id >= 1 << (idp->layers * IDR_BITS)) {
76289+ if (id >= (1 << (idp->layers * IDR_BITS))) {
76290 *starting_id = id;
76291 return IDR_NEED_TO_GROW;
76292 }
76293diff --git a/lib/inflate.c b/lib/inflate.c
76294index d102559..4215f31 100644
76295--- a/lib/inflate.c
76296+++ b/lib/inflate.c
76297@@ -266,7 +266,7 @@ static void free(void *where)
76298 malloc_ptr = free_mem_ptr;
76299 }
76300 #else
76301-#define malloc(a) kmalloc(a, GFP_KERNEL)
76302+#define malloc(a) kmalloc((a), GFP_KERNEL)
76303 #define free(a) kfree(a)
76304 #endif
76305
76306diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
76307index bd2bea9..6b3c95e 100644
76308--- a/lib/is_single_threaded.c
76309+++ b/lib/is_single_threaded.c
76310@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
76311 struct task_struct *p, *t;
76312 bool ret;
76313
76314+ if (!mm)
76315+ return true;
76316+
76317 if (atomic_read(&task->signal->live) != 1)
76318 return false;
76319
76320diff --git a/lib/kobject.c b/lib/kobject.c
76321index b512b74..8115eb1 100644
76322--- a/lib/kobject.c
76323+++ b/lib/kobject.c
76324@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct kobject *kobj, struct attribute *attr,
76325 return ret;
76326 }
76327
76328-struct sysfs_ops kobj_sysfs_ops = {
76329+const struct sysfs_ops kobj_sysfs_ops = {
76330 .show = kobj_attr_show,
76331 .store = kobj_attr_store,
76332 };
76333@@ -789,7 +789,7 @@ static struct kobj_type kset_ktype = {
76334 * If the kset was not able to be created, NULL will be returned.
76335 */
76336 static struct kset *kset_create(const char *name,
76337- struct kset_uevent_ops *uevent_ops,
76338+ const struct kset_uevent_ops *uevent_ops,
76339 struct kobject *parent_kobj)
76340 {
76341 struct kset *kset;
76342@@ -832,7 +832,7 @@ static struct kset *kset_create(const char *name,
76343 * If the kset was not able to be created, NULL will be returned.
76344 */
76345 struct kset *kset_create_and_add(const char *name,
76346- struct kset_uevent_ops *uevent_ops,
76347+ const struct kset_uevent_ops *uevent_ops,
76348 struct kobject *parent_kobj)
76349 {
76350 struct kset *kset;
76351diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
76352index 507b821..0bf8ed0 100644
76353--- a/lib/kobject_uevent.c
76354+++ b/lib/kobject_uevent.c
76355@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
76356 const char *subsystem;
76357 struct kobject *top_kobj;
76358 struct kset *kset;
76359- struct kset_uevent_ops *uevent_ops;
76360+ const struct kset_uevent_ops *uevent_ops;
76361 u64 seq;
76362 int i = 0;
76363 int retval = 0;
76364diff --git a/lib/kref.c b/lib/kref.c
76365index 9ecd6e8..12c94c1 100644
76366--- a/lib/kref.c
76367+++ b/lib/kref.c
76368@@ -61,7 +61,7 @@ void kref_get(struct kref *kref)
76369 */
76370 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
76371 {
76372- WARN_ON(release == NULL);
76373+ BUG_ON(release == NULL);
76374 WARN_ON(release == (void (*)(struct kref *))kfree);
76375
76376 if (atomic_dec_and_test(&kref->refcount)) {
76377diff --git a/lib/parser.c b/lib/parser.c
76378index b00d020..1b34325 100644
76379--- a/lib/parser.c
76380+++ b/lib/parser.c
76381@@ -126,7 +126,7 @@ static int match_number(substring_t *s, int *result, int base)
76382 char *buf;
76383 int ret;
76384
76385- buf = kmalloc(s->to - s->from + 1, GFP_KERNEL);
76386+ buf = kmalloc((s->to - s->from) + 1, GFP_KERNEL);
76387 if (!buf)
76388 return -ENOMEM;
76389 memcpy(buf, s->from, s->to - s->from);
76390diff --git a/lib/radix-tree.c b/lib/radix-tree.c
76391index 92cdd99..a8149d7 100644
76392--- a/lib/radix-tree.c
76393+++ b/lib/radix-tree.c
76394@@ -81,7 +81,7 @@ struct radix_tree_preload {
76395 int nr;
76396 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
76397 };
76398-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
76399+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
76400
76401 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
76402 {
76403diff --git a/lib/random32.c b/lib/random32.c
76404index 217d5c4..45aba8a 100644
76405--- a/lib/random32.c
76406+++ b/lib/random32.c
76407@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *state)
76408 */
76409 static inline u32 __seed(u32 x, u32 m)
76410 {
76411- return (x < m) ? x + m : x;
76412+ return (x <= m) ? x + m + 1 : x;
76413 }
76414
76415 /**
76416diff --git a/lib/vsprintf.c b/lib/vsprintf.c
76417index 33bed5e..1477e46 100644
76418--- a/lib/vsprintf.c
76419+++ b/lib/vsprintf.c
76420@@ -16,6 +16,9 @@
76421 * - scnprintf and vscnprintf
76422 */
76423
76424+#ifdef CONFIG_GRKERNSEC_HIDESYM
76425+#define __INCLUDED_BY_HIDESYM 1
76426+#endif
76427 #include <stdarg.h>
76428 #include <linux/module.h>
76429 #include <linux/types.h>
76430@@ -546,12 +549,12 @@ static char *number(char *buf, char *end, unsigned long long num,
76431 return buf;
76432 }
76433
76434-static char *string(char *buf, char *end, char *s, struct printf_spec spec)
76435+static char *string(char *buf, char *end, const char *s, struct printf_spec spec)
76436 {
76437 int len, i;
76438
76439 if ((unsigned long)s < PAGE_SIZE)
76440- s = "<NULL>";
76441+ s = "(null)";
76442
76443 len = strnlen(s, spec.precision);
76444
76445@@ -581,7 +584,7 @@ static char *symbol_string(char *buf, char *end, void *ptr,
76446 unsigned long value = (unsigned long) ptr;
76447 #ifdef CONFIG_KALLSYMS
76448 char sym[KSYM_SYMBOL_LEN];
76449- if (ext != 'f' && ext != 's')
76450+ if (ext != 'f' && ext != 's' && ext != 'a')
76451 sprint_symbol(sym, value);
76452 else
76453 kallsyms_lookup(value, NULL, NULL, NULL, sym);
76454@@ -801,6 +804,8 @@ static char *ip4_addr_string(char *buf, char *end, const u8 *addr,
76455 * - 'f' For simple symbolic function names without offset
76456 * - 'S' For symbolic direct pointers with offset
76457 * - 's' For symbolic direct pointers without offset
76458+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
76459+ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
76460 * - 'R' For a struct resource pointer, it prints the range of
76461 * addresses (not the name nor the flags)
76462 * - 'M' For a 6-byte MAC address, it prints the address in the
76463@@ -822,7 +827,7 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
76464 struct printf_spec spec)
76465 {
76466 if (!ptr)
76467- return string(buf, end, "(null)", spec);
76468+ return string(buf, end, "(nil)", spec);
76469
76470 switch (*fmt) {
76471 case 'F':
76472@@ -831,6 +836,14 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
76473 case 's':
76474 /* Fallthrough */
76475 case 'S':
76476+#ifdef CONFIG_GRKERNSEC_HIDESYM
76477+ break;
76478+#else
76479+ return symbol_string(buf, end, ptr, spec, *fmt);
76480+#endif
76481+ case 'a':
76482+ /* Fallthrough */
76483+ case 'A':
76484 return symbol_string(buf, end, ptr, spec, *fmt);
76485 case 'R':
76486 return resource_string(buf, end, ptr, spec);
76487@@ -1445,7 +1458,7 @@ do { \
76488 size_t len;
76489 if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE
76490 || (unsigned long)save_str < PAGE_SIZE)
76491- save_str = "<NULL>";
76492+ save_str = "(null)";
76493 len = strlen(save_str);
76494 if (str + len + 1 < end)
76495 memcpy(str, save_str, len + 1);
76496@@ -1555,11 +1568,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
76497 typeof(type) value; \
76498 if (sizeof(type) == 8) { \
76499 args = PTR_ALIGN(args, sizeof(u32)); \
76500- *(u32 *)&value = *(u32 *)args; \
76501- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
76502+ *(u32 *)&value = *(const u32 *)args; \
76503+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
76504 } else { \
76505 args = PTR_ALIGN(args, sizeof(type)); \
76506- value = *(typeof(type) *)args; \
76507+ value = *(const typeof(type) *)args; \
76508 } \
76509 args += sizeof(type); \
76510 value; \
76511@@ -1622,7 +1635,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
76512 const char *str_arg = args;
76513 size_t len = strlen(str_arg);
76514 args += len + 1;
76515- str = string(str, end, (char *)str_arg, spec);
76516+ str = string(str, end, str_arg, spec);
76517 break;
76518 }
76519
76520diff --git a/localversion-grsec b/localversion-grsec
76521new file mode 100644
76522index 0000000..7cd6065
76523--- /dev/null
76524+++ b/localversion-grsec
76525@@ -0,0 +1 @@
76526+-grsec
76527diff --git a/mm/Kconfig b/mm/Kconfig
76528index 2c19c0b..f3c3f83 100644
76529--- a/mm/Kconfig
76530+++ b/mm/Kconfig
76531@@ -228,7 +228,7 @@ config KSM
76532 config DEFAULT_MMAP_MIN_ADDR
76533 int "Low address space to protect from user allocation"
76534 depends on MMU
76535- default 4096
76536+ default 65536
76537 help
76538 This is the portion of low virtual memory which should be protected
76539 from userspace allocation. Keeping a user from writing to low pages
76540diff --git a/mm/backing-dev.c b/mm/backing-dev.c
76541index 67a33a5..094dcf1 100644
76542--- a/mm/backing-dev.c
76543+++ b/mm/backing-dev.c
76544@@ -272,7 +272,7 @@ static void bdi_task_init(struct backing_dev_info *bdi,
76545 list_add_tail_rcu(&wb->list, &bdi->wb_list);
76546 spin_unlock(&bdi->wb_lock);
76547
76548- tsk->flags |= PF_FLUSHER | PF_SWAPWRITE;
76549+ tsk->flags |= PF_SWAPWRITE;
76550 set_freezable();
76551
76552 /*
76553@@ -484,7 +484,7 @@ static void bdi_add_to_pending(struct rcu_head *head)
76554 * Add the default flusher task that gets created for any bdi
76555 * that has dirty data pending writeout
76556 */
76557-void static bdi_add_default_flusher_task(struct backing_dev_info *bdi)
76558+static void bdi_add_default_flusher_task(struct backing_dev_info *bdi)
76559 {
76560 if (!bdi_cap_writeback_dirty(bdi))
76561 return;
76562diff --git a/mm/filemap.c b/mm/filemap.c
76563index a1fe378..e26702f 100644
76564--- a/mm/filemap.c
76565+++ b/mm/filemap.c
76566@@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
76567 struct address_space *mapping = file->f_mapping;
76568
76569 if (!mapping->a_ops->readpage)
76570- return -ENOEXEC;
76571+ return -ENODEV;
76572 file_accessed(file);
76573 vma->vm_ops = &generic_file_vm_ops;
76574 vma->vm_flags |= VM_CAN_NONLINEAR;
76575@@ -2024,6 +2024,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
76576 *pos = i_size_read(inode);
76577
76578 if (limit != RLIM_INFINITY) {
76579+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
76580 if (*pos >= limit) {
76581 send_sig(SIGXFSZ, current, 0);
76582 return -EFBIG;
76583diff --git a/mm/fremap.c b/mm/fremap.c
76584index b6ec85a..a24ac22 100644
76585--- a/mm/fremap.c
76586+++ b/mm/fremap.c
76587@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
76588 retry:
76589 vma = find_vma(mm, start);
76590
76591+#ifdef CONFIG_PAX_SEGMEXEC
76592+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
76593+ goto out;
76594+#endif
76595+
76596 /*
76597 * Make sure the vma is shared, that it supports prefaulting,
76598 * and that the remapped range is valid and fully within
76599@@ -221,7 +226,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
76600 /*
76601 * drop PG_Mlocked flag for over-mapped range
76602 */
76603- unsigned int saved_flags = vma->vm_flags;
76604+ unsigned long saved_flags = vma->vm_flags;
76605 munlock_vma_pages_range(vma, start, start + size);
76606 vma->vm_flags = saved_flags;
76607 }
76608diff --git a/mm/highmem.c b/mm/highmem.c
76609index 9c1e627..5ca9447 100644
76610--- a/mm/highmem.c
76611+++ b/mm/highmem.c
76612@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
76613 * So no dangers, even with speculative execution.
76614 */
76615 page = pte_page(pkmap_page_table[i]);
76616+ pax_open_kernel();
76617 pte_clear(&init_mm, (unsigned long)page_address(page),
76618 &pkmap_page_table[i]);
76619-
76620+ pax_close_kernel();
76621 set_page_address(page, NULL);
76622 need_flush = 1;
76623 }
76624@@ -177,9 +178,11 @@ start:
76625 }
76626 }
76627 vaddr = PKMAP_ADDR(last_pkmap_nr);
76628+
76629+ pax_open_kernel();
76630 set_pte_at(&init_mm, vaddr,
76631 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
76632-
76633+ pax_close_kernel();
76634 pkmap_count[last_pkmap_nr] = 1;
76635 set_page_address(page, (void *)vaddr);
76636
76637diff --git a/mm/hugetlb.c b/mm/hugetlb.c
76638index 5e1e508..ac70275 100644
76639--- a/mm/hugetlb.c
76640+++ b/mm/hugetlb.c
76641@@ -869,6 +869,7 @@ free:
76642 list_del(&page->lru);
76643 enqueue_huge_page(h, page);
76644 }
76645+ spin_unlock(&hugetlb_lock);
76646
76647 /* Free unnecessary surplus pages to the buddy allocator */
76648 if (!list_empty(&surplus_list)) {
76649@@ -1933,6 +1934,26 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
76650 return 1;
76651 }
76652
76653+#ifdef CONFIG_PAX_SEGMEXEC
76654+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
76655+{
76656+ struct mm_struct *mm = vma->vm_mm;
76657+ struct vm_area_struct *vma_m;
76658+ unsigned long address_m;
76659+ pte_t *ptep_m;
76660+
76661+ vma_m = pax_find_mirror_vma(vma);
76662+ if (!vma_m)
76663+ return;
76664+
76665+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
76666+ address_m = address + SEGMEXEC_TASK_SIZE;
76667+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
76668+ get_page(page_m);
76669+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
76670+}
76671+#endif
76672+
76673 static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
76674 unsigned long address, pte_t *ptep, pte_t pte,
76675 struct page *pagecache_page)
76676@@ -2004,6 +2025,11 @@ retry_avoidcopy:
76677 huge_ptep_clear_flush(vma, address, ptep);
76678 set_huge_pte_at(mm, address, ptep,
76679 make_huge_pte(vma, new_page, 1));
76680+
76681+#ifdef CONFIG_PAX_SEGMEXEC
76682+ pax_mirror_huge_pte(vma, address, new_page);
76683+#endif
76684+
76685 /* Make the old page be freed below */
76686 new_page = old_page;
76687 }
76688@@ -2135,6 +2161,10 @@ retry:
76689 && (vma->vm_flags & VM_SHARED)));
76690 set_huge_pte_at(mm, address, ptep, new_pte);
76691
76692+#ifdef CONFIG_PAX_SEGMEXEC
76693+ pax_mirror_huge_pte(vma, address, page);
76694+#endif
76695+
76696 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
76697 /* Optimization, do the COW without a second fault */
76698 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
76699@@ -2163,6 +2193,28 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
76700 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
76701 struct hstate *h = hstate_vma(vma);
76702
76703+#ifdef CONFIG_PAX_SEGMEXEC
76704+ struct vm_area_struct *vma_m;
76705+
76706+ vma_m = pax_find_mirror_vma(vma);
76707+ if (vma_m) {
76708+ unsigned long address_m;
76709+
76710+ if (vma->vm_start > vma_m->vm_start) {
76711+ address_m = address;
76712+ address -= SEGMEXEC_TASK_SIZE;
76713+ vma = vma_m;
76714+ h = hstate_vma(vma);
76715+ } else
76716+ address_m = address + SEGMEXEC_TASK_SIZE;
76717+
76718+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
76719+ return VM_FAULT_OOM;
76720+ address_m &= HPAGE_MASK;
76721+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
76722+ }
76723+#endif
76724+
76725 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
76726 if (!ptep)
76727 return VM_FAULT_OOM;
76728diff --git a/mm/internal.h b/mm/internal.h
76729index f03e8e2..7354343 100644
76730--- a/mm/internal.h
76731+++ b/mm/internal.h
76732@@ -49,6 +49,7 @@ extern void putback_lru_page(struct page *page);
76733 * in mm/page_alloc.c
76734 */
76735 extern void __free_pages_bootmem(struct page *page, unsigned int order);
76736+extern void free_compound_page(struct page *page);
76737 extern void prep_compound_page(struct page *page, unsigned long order);
76738
76739
76740diff --git a/mm/kmemleak.c b/mm/kmemleak.c
76741index c346660..b47382f 100644
76742--- a/mm/kmemleak.c
76743+++ b/mm/kmemleak.c
76744@@ -358,7 +358,7 @@ static void print_unreferenced(struct seq_file *seq,
76745
76746 for (i = 0; i < object->trace_len; i++) {
76747 void *ptr = (void *)object->trace[i];
76748- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
76749+ seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
76750 }
76751 }
76752
76753diff --git a/mm/maccess.c b/mm/maccess.c
76754index 9073695..1127f348 100644
76755--- a/mm/maccess.c
76756+++ b/mm/maccess.c
76757@@ -14,7 +14,7 @@
76758 * Safely read from address @src to the buffer at @dst. If a kernel fault
76759 * happens, handle that and return -EFAULT.
76760 */
76761-long probe_kernel_read(void *dst, void *src, size_t size)
76762+long probe_kernel_read(void *dst, const void *src, size_t size)
76763 {
76764 long ret;
76765 mm_segment_t old_fs = get_fs();
76766@@ -22,7 +22,7 @@ long probe_kernel_read(void *dst, void *src, size_t size)
76767 set_fs(KERNEL_DS);
76768 pagefault_disable();
76769 ret = __copy_from_user_inatomic(dst,
76770- (__force const void __user *)src, size);
76771+ (const void __force_user *)src, size);
76772 pagefault_enable();
76773 set_fs(old_fs);
76774
76775@@ -39,14 +39,14 @@ EXPORT_SYMBOL_GPL(probe_kernel_read);
76776 * Safely write to address @dst from the buffer at @src. If a kernel fault
76777 * happens, handle that and return -EFAULT.
76778 */
76779-long notrace __weak probe_kernel_write(void *dst, void *src, size_t size)
76780+long notrace __weak probe_kernel_write(void *dst, const void *src, size_t size)
76781 {
76782 long ret;
76783 mm_segment_t old_fs = get_fs();
76784
76785 set_fs(KERNEL_DS);
76786 pagefault_disable();
76787- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
76788+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
76789 pagefault_enable();
76790 set_fs(old_fs);
76791
76792diff --git a/mm/madvise.c b/mm/madvise.c
76793index 35b1479..499f7d4 100644
76794--- a/mm/madvise.c
76795+++ b/mm/madvise.c
76796@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
76797 pgoff_t pgoff;
76798 unsigned long new_flags = vma->vm_flags;
76799
76800+#ifdef CONFIG_PAX_SEGMEXEC
76801+ struct vm_area_struct *vma_m;
76802+#endif
76803+
76804 switch (behavior) {
76805 case MADV_NORMAL:
76806 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
76807@@ -103,6 +107,13 @@ success:
76808 /*
76809 * vm_flags is protected by the mmap_sem held in write mode.
76810 */
76811+
76812+#ifdef CONFIG_PAX_SEGMEXEC
76813+ vma_m = pax_find_mirror_vma(vma);
76814+ if (vma_m)
76815+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
76816+#endif
76817+
76818 vma->vm_flags = new_flags;
76819
76820 out:
76821@@ -161,6 +172,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
76822 struct vm_area_struct ** prev,
76823 unsigned long start, unsigned long end)
76824 {
76825+
76826+#ifdef CONFIG_PAX_SEGMEXEC
76827+ struct vm_area_struct *vma_m;
76828+#endif
76829+
76830 *prev = vma;
76831 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
76832 return -EINVAL;
76833@@ -173,6 +189,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
76834 zap_page_range(vma, start, end - start, &details);
76835 } else
76836 zap_page_range(vma, start, end - start, NULL);
76837+
76838+#ifdef CONFIG_PAX_SEGMEXEC
76839+ vma_m = pax_find_mirror_vma(vma);
76840+ if (vma_m) {
76841+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
76842+ struct zap_details details = {
76843+ .nonlinear_vma = vma_m,
76844+ .last_index = ULONG_MAX,
76845+ };
76846+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
76847+ } else
76848+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
76849+ }
76850+#endif
76851+
76852 return 0;
76853 }
76854
76855@@ -359,6 +390,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
76856 if (end < start)
76857 goto out;
76858
76859+#ifdef CONFIG_PAX_SEGMEXEC
76860+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
76861+ if (end > SEGMEXEC_TASK_SIZE)
76862+ goto out;
76863+ } else
76864+#endif
76865+
76866+ if (end > TASK_SIZE)
76867+ goto out;
76868+
76869 error = 0;
76870 if (end == start)
76871 goto out;
76872diff --git a/mm/memory-failure.c b/mm/memory-failure.c
76873index 8aeba53..b4a4198 100644
76874--- a/mm/memory-failure.c
76875+++ b/mm/memory-failure.c
76876@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
76877
76878 int sysctl_memory_failure_recovery __read_mostly = 1;
76879
76880-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
76881+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
76882
76883 /*
76884 * Send all the processes who have the page mapped an ``action optional''
76885@@ -64,7 +64,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
76886 si.si_signo = SIGBUS;
76887 si.si_errno = 0;
76888 si.si_code = BUS_MCEERR_AO;
76889- si.si_addr = (void *)addr;
76890+ si.si_addr = (void __user *)addr;
76891 #ifdef __ARCH_SI_TRAPNO
76892 si.si_trapno = trapno;
76893 #endif
76894@@ -745,7 +745,7 @@ int __memory_failure(unsigned long pfn, int trapno, int ref)
76895 return 0;
76896 }
76897
76898- atomic_long_add(1, &mce_bad_pages);
76899+ atomic_long_add_unchecked(1, &mce_bad_pages);
76900
76901 /*
76902 * We need/can do nothing about count=0 pages.
76903diff --git a/mm/memory.c b/mm/memory.c
76904index 6c836d3..48f3264 100644
76905--- a/mm/memory.c
76906+++ b/mm/memory.c
76907@@ -187,8 +187,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
76908 return;
76909
76910 pmd = pmd_offset(pud, start);
76911+
76912+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
76913 pud_clear(pud);
76914 pmd_free_tlb(tlb, pmd, start);
76915+#endif
76916+
76917 }
76918
76919 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
76920@@ -219,9 +223,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
76921 if (end - 1 > ceiling - 1)
76922 return;
76923
76924+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
76925 pud = pud_offset(pgd, start);
76926 pgd_clear(pgd);
76927 pud_free_tlb(tlb, pud, start);
76928+#endif
76929+
76930 }
76931
76932 /*
76933@@ -1251,10 +1258,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
76934 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
76935 i = 0;
76936
76937- do {
76938+ while (nr_pages) {
76939 struct vm_area_struct *vma;
76940
76941- vma = find_extend_vma(mm, start);
76942+ vma = find_vma(mm, start);
76943 if (!vma && in_gate_area(tsk, start)) {
76944 unsigned long pg = start & PAGE_MASK;
76945 struct vm_area_struct *gate_vma = get_gate_vma(tsk);
76946@@ -1306,7 +1313,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
76947 continue;
76948 }
76949
76950- if (!vma ||
76951+ if (!vma || start < vma->vm_start ||
76952 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
76953 !(vm_flags & vma->vm_flags))
76954 return i ? : -EFAULT;
76955@@ -1381,7 +1388,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
76956 start += PAGE_SIZE;
76957 nr_pages--;
76958 } while (nr_pages && start < vma->vm_end);
76959- } while (nr_pages);
76960+ }
76961 return i;
76962 }
76963
76964@@ -1526,6 +1533,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
76965 page_add_file_rmap(page);
76966 set_pte_at(mm, addr, pte, mk_pte(page, prot));
76967
76968+#ifdef CONFIG_PAX_SEGMEXEC
76969+ pax_mirror_file_pte(vma, addr, page, ptl);
76970+#endif
76971+
76972 retval = 0;
76973 pte_unmap_unlock(pte, ptl);
76974 return retval;
76975@@ -1560,10 +1571,22 @@ out:
76976 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
76977 struct page *page)
76978 {
76979+
76980+#ifdef CONFIG_PAX_SEGMEXEC
76981+ struct vm_area_struct *vma_m;
76982+#endif
76983+
76984 if (addr < vma->vm_start || addr >= vma->vm_end)
76985 return -EFAULT;
76986 if (!page_count(page))
76987 return -EINVAL;
76988+
76989+#ifdef CONFIG_PAX_SEGMEXEC
76990+ vma_m = pax_find_mirror_vma(vma);
76991+ if (vma_m)
76992+ vma_m->vm_flags |= VM_INSERTPAGE;
76993+#endif
76994+
76995 vma->vm_flags |= VM_INSERTPAGE;
76996 return insert_page(vma, addr, page, vma->vm_page_prot);
76997 }
76998@@ -1649,6 +1672,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
76999 unsigned long pfn)
77000 {
77001 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
77002+ BUG_ON(vma->vm_mirror);
77003
77004 if (addr < vma->vm_start || addr >= vma->vm_end)
77005 return -EFAULT;
77006@@ -1977,6 +2001,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
77007 copy_user_highpage(dst, src, va, vma);
77008 }
77009
77010+#ifdef CONFIG_PAX_SEGMEXEC
77011+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
77012+{
77013+ struct mm_struct *mm = vma->vm_mm;
77014+ spinlock_t *ptl;
77015+ pte_t *pte, entry;
77016+
77017+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
77018+ entry = *pte;
77019+ if (!pte_present(entry)) {
77020+ if (!pte_none(entry)) {
77021+ BUG_ON(pte_file(entry));
77022+ free_swap_and_cache(pte_to_swp_entry(entry));
77023+ pte_clear_not_present_full(mm, address, pte, 0);
77024+ }
77025+ } else {
77026+ struct page *page;
77027+
77028+ flush_cache_page(vma, address, pte_pfn(entry));
77029+ entry = ptep_clear_flush(vma, address, pte);
77030+ BUG_ON(pte_dirty(entry));
77031+ page = vm_normal_page(vma, address, entry);
77032+ if (page) {
77033+ update_hiwater_rss(mm);
77034+ if (PageAnon(page))
77035+ dec_mm_counter(mm, anon_rss);
77036+ else
77037+ dec_mm_counter(mm, file_rss);
77038+ page_remove_rmap(page);
77039+ page_cache_release(page);
77040+ }
77041+ }
77042+ pte_unmap_unlock(pte, ptl);
77043+}
77044+
77045+/* PaX: if vma is mirrored, synchronize the mirror's PTE
77046+ *
77047+ * the ptl of the lower mapped page is held on entry and is not released on exit
77048+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
77049+ */
77050+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
77051+{
77052+ struct mm_struct *mm = vma->vm_mm;
77053+ unsigned long address_m;
77054+ spinlock_t *ptl_m;
77055+ struct vm_area_struct *vma_m;
77056+ pmd_t *pmd_m;
77057+ pte_t *pte_m, entry_m;
77058+
77059+ BUG_ON(!page_m || !PageAnon(page_m));
77060+
77061+ vma_m = pax_find_mirror_vma(vma);
77062+ if (!vma_m)
77063+ return;
77064+
77065+ BUG_ON(!PageLocked(page_m));
77066+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
77067+ address_m = address + SEGMEXEC_TASK_SIZE;
77068+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
77069+ pte_m = pte_offset_map_nested(pmd_m, address_m);
77070+ ptl_m = pte_lockptr(mm, pmd_m);
77071+ if (ptl != ptl_m) {
77072+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
77073+ if (!pte_none(*pte_m))
77074+ goto out;
77075+ }
77076+
77077+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
77078+ page_cache_get(page_m);
77079+ page_add_anon_rmap(page_m, vma_m, address_m);
77080+ inc_mm_counter(mm, anon_rss);
77081+ set_pte_at(mm, address_m, pte_m, entry_m);
77082+ update_mmu_cache(vma_m, address_m, entry_m);
77083+out:
77084+ if (ptl != ptl_m)
77085+ spin_unlock(ptl_m);
77086+ pte_unmap_nested(pte_m);
77087+ unlock_page(page_m);
77088+}
77089+
77090+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
77091+{
77092+ struct mm_struct *mm = vma->vm_mm;
77093+ unsigned long address_m;
77094+ spinlock_t *ptl_m;
77095+ struct vm_area_struct *vma_m;
77096+ pmd_t *pmd_m;
77097+ pte_t *pte_m, entry_m;
77098+
77099+ BUG_ON(!page_m || PageAnon(page_m));
77100+
77101+ vma_m = pax_find_mirror_vma(vma);
77102+ if (!vma_m)
77103+ return;
77104+
77105+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
77106+ address_m = address + SEGMEXEC_TASK_SIZE;
77107+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
77108+ pte_m = pte_offset_map_nested(pmd_m, address_m);
77109+ ptl_m = pte_lockptr(mm, pmd_m);
77110+ if (ptl != ptl_m) {
77111+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
77112+ if (!pte_none(*pte_m))
77113+ goto out;
77114+ }
77115+
77116+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
77117+ page_cache_get(page_m);
77118+ page_add_file_rmap(page_m);
77119+ inc_mm_counter(mm, file_rss);
77120+ set_pte_at(mm, address_m, pte_m, entry_m);
77121+ update_mmu_cache(vma_m, address_m, entry_m);
77122+out:
77123+ if (ptl != ptl_m)
77124+ spin_unlock(ptl_m);
77125+ pte_unmap_nested(pte_m);
77126+}
77127+
77128+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
77129+{
77130+ struct mm_struct *mm = vma->vm_mm;
77131+ unsigned long address_m;
77132+ spinlock_t *ptl_m;
77133+ struct vm_area_struct *vma_m;
77134+ pmd_t *pmd_m;
77135+ pte_t *pte_m, entry_m;
77136+
77137+ vma_m = pax_find_mirror_vma(vma);
77138+ if (!vma_m)
77139+ return;
77140+
77141+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
77142+ address_m = address + SEGMEXEC_TASK_SIZE;
77143+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
77144+ pte_m = pte_offset_map_nested(pmd_m, address_m);
77145+ ptl_m = pte_lockptr(mm, pmd_m);
77146+ if (ptl != ptl_m) {
77147+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
77148+ if (!pte_none(*pte_m))
77149+ goto out;
77150+ }
77151+
77152+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
77153+ set_pte_at(mm, address_m, pte_m, entry_m);
77154+out:
77155+ if (ptl != ptl_m)
77156+ spin_unlock(ptl_m);
77157+ pte_unmap_nested(pte_m);
77158+}
77159+
77160+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
77161+{
77162+ struct page *page_m;
77163+ pte_t entry;
77164+
77165+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
77166+ goto out;
77167+
77168+ entry = *pte;
77169+ page_m = vm_normal_page(vma, address, entry);
77170+ if (!page_m)
77171+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
77172+ else if (PageAnon(page_m)) {
77173+ if (pax_find_mirror_vma(vma)) {
77174+ pte_unmap_unlock(pte, ptl);
77175+ lock_page(page_m);
77176+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
77177+ if (pte_same(entry, *pte))
77178+ pax_mirror_anon_pte(vma, address, page_m, ptl);
77179+ else
77180+ unlock_page(page_m);
77181+ }
77182+ } else
77183+ pax_mirror_file_pte(vma, address, page_m, ptl);
77184+
77185+out:
77186+ pte_unmap_unlock(pte, ptl);
77187+}
77188+#endif
77189+
77190 /*
77191 * This routine handles present pages, when users try to write
77192 * to a shared page. It is done by copying the page to a new address
77193@@ -2156,6 +2360,12 @@ gotten:
77194 */
77195 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
77196 if (likely(pte_same(*page_table, orig_pte))) {
77197+
77198+#ifdef CONFIG_PAX_SEGMEXEC
77199+ if (pax_find_mirror_vma(vma))
77200+ BUG_ON(!trylock_page(new_page));
77201+#endif
77202+
77203 if (old_page) {
77204 if (!PageAnon(old_page)) {
77205 dec_mm_counter(mm, file_rss);
77206@@ -2207,6 +2417,10 @@ gotten:
77207 page_remove_rmap(old_page);
77208 }
77209
77210+#ifdef CONFIG_PAX_SEGMEXEC
77211+ pax_mirror_anon_pte(vma, address, new_page, ptl);
77212+#endif
77213+
77214 /* Free the old page.. */
77215 new_page = old_page;
77216 ret |= VM_FAULT_WRITE;
77217@@ -2606,6 +2820,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
77218 swap_free(entry);
77219 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
77220 try_to_free_swap(page);
77221+
77222+#ifdef CONFIG_PAX_SEGMEXEC
77223+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
77224+#endif
77225+
77226 unlock_page(page);
77227
77228 if (flags & FAULT_FLAG_WRITE) {
77229@@ -2617,6 +2836,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
77230
77231 /* No need to invalidate - it was non-present before */
77232 update_mmu_cache(vma, address, pte);
77233+
77234+#ifdef CONFIG_PAX_SEGMEXEC
77235+ pax_mirror_anon_pte(vma, address, page, ptl);
77236+#endif
77237+
77238 unlock:
77239 pte_unmap_unlock(page_table, ptl);
77240 out:
77241@@ -2632,40 +2856,6 @@ out_release:
77242 }
77243
77244 /*
77245- * This is like a special single-page "expand_{down|up}wards()",
77246- * except we must first make sure that 'address{-|+}PAGE_SIZE'
77247- * doesn't hit another vma.
77248- */
77249-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
77250-{
77251- address &= PAGE_MASK;
77252- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
77253- struct vm_area_struct *prev = vma->vm_prev;
77254-
77255- /*
77256- * Is there a mapping abutting this one below?
77257- *
77258- * That's only ok if it's the same stack mapping
77259- * that has gotten split..
77260- */
77261- if (prev && prev->vm_end == address)
77262- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
77263-
77264- expand_stack(vma, address - PAGE_SIZE);
77265- }
77266- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
77267- struct vm_area_struct *next = vma->vm_next;
77268-
77269- /* As VM_GROWSDOWN but s/below/above/ */
77270- if (next && next->vm_start == address + PAGE_SIZE)
77271- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
77272-
77273- expand_upwards(vma, address + PAGE_SIZE);
77274- }
77275- return 0;
77276-}
77277-
77278-/*
77279 * We enter with non-exclusive mmap_sem (to exclude vma changes,
77280 * but allow concurrent faults), and pte mapped but not yet locked.
77281 * We return with mmap_sem still held, but pte unmapped and unlocked.
77282@@ -2674,27 +2864,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
77283 unsigned long address, pte_t *page_table, pmd_t *pmd,
77284 unsigned int flags)
77285 {
77286- struct page *page;
77287+ struct page *page = NULL;
77288 spinlock_t *ptl;
77289 pte_t entry;
77290
77291- pte_unmap(page_table);
77292-
77293- /* Check if we need to add a guard page to the stack */
77294- if (check_stack_guard_page(vma, address) < 0)
77295- return VM_FAULT_SIGBUS;
77296-
77297- /* Use the zero-page for reads */
77298 if (!(flags & FAULT_FLAG_WRITE)) {
77299 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
77300 vma->vm_page_prot));
77301- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
77302+ ptl = pte_lockptr(mm, pmd);
77303+ spin_lock(ptl);
77304 if (!pte_none(*page_table))
77305 goto unlock;
77306 goto setpte;
77307 }
77308
77309 /* Allocate our own private page. */
77310+ pte_unmap(page_table);
77311+
77312 if (unlikely(anon_vma_prepare(vma)))
77313 goto oom;
77314 page = alloc_zeroed_user_highpage_movable(vma, address);
77315@@ -2713,6 +2899,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
77316 if (!pte_none(*page_table))
77317 goto release;
77318
77319+#ifdef CONFIG_PAX_SEGMEXEC
77320+ if (pax_find_mirror_vma(vma))
77321+ BUG_ON(!trylock_page(page));
77322+#endif
77323+
77324 inc_mm_counter(mm, anon_rss);
77325 page_add_new_anon_rmap(page, vma, address);
77326 setpte:
77327@@ -2720,6 +2911,12 @@ setpte:
77328
77329 /* No need to invalidate - it was non-present before */
77330 update_mmu_cache(vma, address, entry);
77331+
77332+#ifdef CONFIG_PAX_SEGMEXEC
77333+ if (page)
77334+ pax_mirror_anon_pte(vma, address, page, ptl);
77335+#endif
77336+
77337 unlock:
77338 pte_unmap_unlock(page_table, ptl);
77339 return 0;
77340@@ -2862,6 +3059,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
77341 */
77342 /* Only go through if we didn't race with anybody else... */
77343 if (likely(pte_same(*page_table, orig_pte))) {
77344+
77345+#ifdef CONFIG_PAX_SEGMEXEC
77346+ if (anon && pax_find_mirror_vma(vma))
77347+ BUG_ON(!trylock_page(page));
77348+#endif
77349+
77350 flush_icache_page(vma, page);
77351 entry = mk_pte(page, vma->vm_page_prot);
77352 if (flags & FAULT_FLAG_WRITE)
77353@@ -2881,6 +3084,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
77354
77355 /* no need to invalidate: a not-present page won't be cached */
77356 update_mmu_cache(vma, address, entry);
77357+
77358+#ifdef CONFIG_PAX_SEGMEXEC
77359+ if (anon)
77360+ pax_mirror_anon_pte(vma, address, page, ptl);
77361+ else
77362+ pax_mirror_file_pte(vma, address, page, ptl);
77363+#endif
77364+
77365 } else {
77366 if (charged)
77367 mem_cgroup_uncharge_page(page);
77368@@ -3028,6 +3239,12 @@ static inline int handle_pte_fault(struct mm_struct *mm,
77369 if (flags & FAULT_FLAG_WRITE)
77370 flush_tlb_page(vma, address);
77371 }
77372+
77373+#ifdef CONFIG_PAX_SEGMEXEC
77374+ pax_mirror_pte(vma, address, pte, pmd, ptl);
77375+ return 0;
77376+#endif
77377+
77378 unlock:
77379 pte_unmap_unlock(pte, ptl);
77380 return 0;
77381@@ -3044,6 +3261,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
77382 pmd_t *pmd;
77383 pte_t *pte;
77384
77385+#ifdef CONFIG_PAX_SEGMEXEC
77386+ struct vm_area_struct *vma_m;
77387+#endif
77388+
77389 __set_current_state(TASK_RUNNING);
77390
77391 count_vm_event(PGFAULT);
77392@@ -3051,6 +3272,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
77393 if (unlikely(is_vm_hugetlb_page(vma)))
77394 return hugetlb_fault(mm, vma, address, flags);
77395
77396+#ifdef CONFIG_PAX_SEGMEXEC
77397+ vma_m = pax_find_mirror_vma(vma);
77398+ if (vma_m) {
77399+ unsigned long address_m;
77400+ pgd_t *pgd_m;
77401+ pud_t *pud_m;
77402+ pmd_t *pmd_m;
77403+
77404+ if (vma->vm_start > vma_m->vm_start) {
77405+ address_m = address;
77406+ address -= SEGMEXEC_TASK_SIZE;
77407+ vma = vma_m;
77408+ } else
77409+ address_m = address + SEGMEXEC_TASK_SIZE;
77410+
77411+ pgd_m = pgd_offset(mm, address_m);
77412+ pud_m = pud_alloc(mm, pgd_m, address_m);
77413+ if (!pud_m)
77414+ return VM_FAULT_OOM;
77415+ pmd_m = pmd_alloc(mm, pud_m, address_m);
77416+ if (!pmd_m)
77417+ return VM_FAULT_OOM;
77418+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, pmd_m, address_m))
77419+ return VM_FAULT_OOM;
77420+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
77421+ }
77422+#endif
77423+
77424 pgd = pgd_offset(mm, address);
77425 pud = pud_alloc(mm, pgd, address);
77426 if (!pud)
77427@@ -3148,7 +3397,7 @@ static int __init gate_vma_init(void)
77428 gate_vma.vm_start = FIXADDR_USER_START;
77429 gate_vma.vm_end = FIXADDR_USER_END;
77430 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
77431- gate_vma.vm_page_prot = __P101;
77432+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
77433 /*
77434 * Make sure the vDSO gets into every core dump.
77435 * Dumping its contents makes post-mortem fully interpretable later
77436diff --git a/mm/mempolicy.c b/mm/mempolicy.c
77437index 3c6e3e2..b1ddbb8 100644
77438--- a/mm/mempolicy.c
77439+++ b/mm/mempolicy.c
77440@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_struct *vma, unsigned long start,
77441 struct vm_area_struct *next;
77442 int err;
77443
77444+#ifdef CONFIG_PAX_SEGMEXEC
77445+ struct vm_area_struct *vma_m;
77446+#endif
77447+
77448 err = 0;
77449 for (; vma && vma->vm_start < end; vma = next) {
77450 next = vma->vm_next;
77451@@ -584,6 +588,16 @@ static int mbind_range(struct vm_area_struct *vma, unsigned long start,
77452 err = policy_vma(vma, new);
77453 if (err)
77454 break;
77455+
77456+#ifdef CONFIG_PAX_SEGMEXEC
77457+ vma_m = pax_find_mirror_vma(vma);
77458+ if (vma_m) {
77459+ err = policy_vma(vma_m, new);
77460+ if (err)
77461+ break;
77462+ }
77463+#endif
77464+
77465 }
77466 return err;
77467 }
77468@@ -1002,6 +1016,17 @@ static long do_mbind(unsigned long start, unsigned long len,
77469
77470 if (end < start)
77471 return -EINVAL;
77472+
77473+#ifdef CONFIG_PAX_SEGMEXEC
77474+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
77475+ if (end > SEGMEXEC_TASK_SIZE)
77476+ return -EINVAL;
77477+ } else
77478+#endif
77479+
77480+ if (end > TASK_SIZE)
77481+ return -EINVAL;
77482+
77483 if (end == start)
77484 return 0;
77485
77486@@ -1207,6 +1232,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
77487 if (!mm)
77488 return -EINVAL;
77489
77490+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
77491+ if (mm != current->mm &&
77492+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
77493+ err = -EPERM;
77494+ goto out;
77495+ }
77496+#endif
77497+
77498 /*
77499 * Check if this process has the right to modify the specified
77500 * process. The right exists if the process has administrative
77501@@ -1216,8 +1249,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
77502 rcu_read_lock();
77503 tcred = __task_cred(task);
77504 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
77505- cred->uid != tcred->suid && cred->uid != tcred->uid &&
77506- !capable(CAP_SYS_NICE)) {
77507+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
77508 rcu_read_unlock();
77509 err = -EPERM;
77510 goto out;
77511@@ -2367,6 +2399,12 @@ static inline void check_huge_range(struct vm_area_struct *vma,
77512 }
77513 #endif
77514
77515+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
77516+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
77517+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
77518+ _mm->pax_flags & MF_PAX_SEGMEXEC))
77519+#endif
77520+
77521 /*
77522 * Display pages allocated per node and memory policy via /proc.
77523 */
77524@@ -2381,6 +2419,13 @@ int show_numa_map(struct seq_file *m, void *v)
77525 int n;
77526 char buffer[50];
77527
77528+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
77529+ if (current->exec_id != m->exec_id) {
77530+ gr_log_badprocpid("numa_maps");
77531+ return 0;
77532+ }
77533+#endif
77534+
77535 if (!mm)
77536 return 0;
77537
77538@@ -2392,11 +2437,15 @@ int show_numa_map(struct seq_file *m, void *v)
77539 mpol_to_str(buffer, sizeof(buffer), pol, 0);
77540 mpol_cond_put(pol);
77541
77542+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
77543+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
77544+#else
77545 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
77546+#endif
77547
77548 if (file) {
77549 seq_printf(m, " file=");
77550- seq_path(m, &file->f_path, "\n\t= ");
77551+ seq_path(m, &file->f_path, "\n\t\\= ");
77552 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
77553 seq_printf(m, " heap");
77554 } else if (vma->vm_start <= mm->start_stack &&
77555diff --git a/mm/migrate.c b/mm/migrate.c
77556index aaca868..2ebecdc 100644
77557--- a/mm/migrate.c
77558+++ b/mm/migrate.c
77559@@ -916,6 +916,8 @@ static int do_pages_move(struct mm_struct *mm, struct task_struct *task,
77560 unsigned long chunk_start;
77561 int err;
77562
77563+ pax_track_stack();
77564+
77565 task_nodes = cpuset_mems_allowed(task);
77566
77567 err = -ENOMEM;
77568@@ -1106,6 +1108,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
77569 if (!mm)
77570 return -EINVAL;
77571
77572+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
77573+ if (mm != current->mm &&
77574+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
77575+ err = -EPERM;
77576+ goto out;
77577+ }
77578+#endif
77579+
77580 /*
77581 * Check if this process has the right to modify the specified
77582 * process. The right exists if the process has administrative
77583@@ -1115,8 +1125,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
77584 rcu_read_lock();
77585 tcred = __task_cred(task);
77586 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
77587- cred->uid != tcred->suid && cred->uid != tcred->uid &&
77588- !capable(CAP_SYS_NICE)) {
77589+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
77590 rcu_read_unlock();
77591 err = -EPERM;
77592 goto out;
77593diff --git a/mm/mlock.c b/mm/mlock.c
77594index 2d846cf..98134d2 100644
77595--- a/mm/mlock.c
77596+++ b/mm/mlock.c
77597@@ -13,6 +13,7 @@
77598 #include <linux/pagemap.h>
77599 #include <linux/mempolicy.h>
77600 #include <linux/syscalls.h>
77601+#include <linux/security.h>
77602 #include <linux/sched.h>
77603 #include <linux/module.h>
77604 #include <linux/rmap.h>
77605@@ -138,13 +139,6 @@ void munlock_vma_page(struct page *page)
77606 }
77607 }
77608
77609-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
77610-{
77611- return (vma->vm_flags & VM_GROWSDOWN) &&
77612- (vma->vm_start == addr) &&
77613- !vma_stack_continue(vma->vm_prev, addr);
77614-}
77615-
77616 /**
77617 * __mlock_vma_pages_range() - mlock a range of pages in the vma.
77618 * @vma: target vma
77619@@ -177,12 +171,6 @@ static long __mlock_vma_pages_range(struct vm_area_struct *vma,
77620 if (vma->vm_flags & VM_WRITE)
77621 gup_flags |= FOLL_WRITE;
77622
77623- /* We don't try to access the guard page of a stack vma */
77624- if (stack_guard_page(vma, start)) {
77625- addr += PAGE_SIZE;
77626- nr_pages--;
77627- }
77628-
77629 while (nr_pages > 0) {
77630 int i;
77631
77632@@ -440,7 +428,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
77633 {
77634 unsigned long nstart, end, tmp;
77635 struct vm_area_struct * vma, * prev;
77636- int error;
77637+ int error = -EINVAL;
77638
77639 len = PAGE_ALIGN(len);
77640 end = start + len;
77641@@ -448,6 +436,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
77642 return -EINVAL;
77643 if (end == start)
77644 return 0;
77645+ if (end > TASK_SIZE)
77646+ return -EINVAL;
77647+
77648 vma = find_vma_prev(current->mm, start, &prev);
77649 if (!vma || vma->vm_start > start)
77650 return -ENOMEM;
77651@@ -458,6 +449,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
77652 for (nstart = start ; ; ) {
77653 unsigned int newflags;
77654
77655+#ifdef CONFIG_PAX_SEGMEXEC
77656+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
77657+ break;
77658+#endif
77659+
77660 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
77661
77662 newflags = vma->vm_flags | VM_LOCKED;
77663@@ -507,6 +503,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
77664 lock_limit >>= PAGE_SHIFT;
77665
77666 /* check against resource limits */
77667+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
77668 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
77669 error = do_mlock(start, len, 1);
77670 up_write(&current->mm->mmap_sem);
77671@@ -528,17 +525,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
77672 static int do_mlockall(int flags)
77673 {
77674 struct vm_area_struct * vma, * prev = NULL;
77675- unsigned int def_flags = 0;
77676
77677 if (flags & MCL_FUTURE)
77678- def_flags = VM_LOCKED;
77679- current->mm->def_flags = def_flags;
77680+ current->mm->def_flags |= VM_LOCKED;
77681+ else
77682+ current->mm->def_flags &= ~VM_LOCKED;
77683 if (flags == MCL_FUTURE)
77684 goto out;
77685
77686 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
77687- unsigned int newflags;
77688+ unsigned long newflags;
77689
77690+#ifdef CONFIG_PAX_SEGMEXEC
77691+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
77692+ break;
77693+#endif
77694+
77695+ BUG_ON(vma->vm_end > TASK_SIZE);
77696 newflags = vma->vm_flags | VM_LOCKED;
77697 if (!(flags & MCL_CURRENT))
77698 newflags &= ~VM_LOCKED;
77699@@ -570,6 +573,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
77700 lock_limit >>= PAGE_SHIFT;
77701
77702 ret = -ENOMEM;
77703+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
77704 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
77705 capable(CAP_IPC_LOCK))
77706 ret = do_mlockall(flags);
77707diff --git a/mm/mmap.c b/mm/mmap.c
77708index 4b80cbf..c5ce1df 100644
77709--- a/mm/mmap.c
77710+++ b/mm/mmap.c
77711@@ -45,6 +45,16 @@
77712 #define arch_rebalance_pgtables(addr, len) (addr)
77713 #endif
77714
77715+static inline void verify_mm_writelocked(struct mm_struct *mm)
77716+{
77717+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
77718+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
77719+ up_read(&mm->mmap_sem);
77720+ BUG();
77721+ }
77722+#endif
77723+}
77724+
77725 static void unmap_region(struct mm_struct *mm,
77726 struct vm_area_struct *vma, struct vm_area_struct *prev,
77727 unsigned long start, unsigned long end);
77728@@ -70,22 +80,32 @@ static void unmap_region(struct mm_struct *mm,
77729 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
77730 *
77731 */
77732-pgprot_t protection_map[16] = {
77733+pgprot_t protection_map[16] __read_only = {
77734 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
77735 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
77736 };
77737
77738 pgprot_t vm_get_page_prot(unsigned long vm_flags)
77739 {
77740- return __pgprot(pgprot_val(protection_map[vm_flags &
77741+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
77742 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
77743 pgprot_val(arch_vm_get_page_prot(vm_flags)));
77744+
77745+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
77746+ if (!nx_enabled &&
77747+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
77748+ (vm_flags & (VM_READ | VM_WRITE)))
77749+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
77750+#endif
77751+
77752+ return prot;
77753 }
77754 EXPORT_SYMBOL(vm_get_page_prot);
77755
77756 int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
77757 int sysctl_overcommit_ratio = 50; /* default is 50% */
77758 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
77759+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
77760 struct percpu_counter vm_committed_as;
77761
77762 /*
77763@@ -231,6 +251,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
77764 struct vm_area_struct *next = vma->vm_next;
77765
77766 might_sleep();
77767+ BUG_ON(vma->vm_mirror);
77768 if (vma->vm_ops && vma->vm_ops->close)
77769 vma->vm_ops->close(vma);
77770 if (vma->vm_file) {
77771@@ -267,6 +288,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
77772 * not page aligned -Ram Gupta
77773 */
77774 rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
77775+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
77776 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
77777 (mm->end_data - mm->start_data) > rlim)
77778 goto out;
77779@@ -704,6 +726,12 @@ static int
77780 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
77781 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
77782 {
77783+
77784+#ifdef CONFIG_PAX_SEGMEXEC
77785+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
77786+ return 0;
77787+#endif
77788+
77789 if (is_mergeable_vma(vma, file, vm_flags) &&
77790 is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
77791 if (vma->vm_pgoff == vm_pgoff)
77792@@ -723,6 +751,12 @@ static int
77793 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
77794 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
77795 {
77796+
77797+#ifdef CONFIG_PAX_SEGMEXEC
77798+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
77799+ return 0;
77800+#endif
77801+
77802 if (is_mergeable_vma(vma, file, vm_flags) &&
77803 is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
77804 pgoff_t vm_pglen;
77805@@ -765,12 +799,19 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
77806 struct vm_area_struct *vma_merge(struct mm_struct *mm,
77807 struct vm_area_struct *prev, unsigned long addr,
77808 unsigned long end, unsigned long vm_flags,
77809- struct anon_vma *anon_vma, struct file *file,
77810+ struct anon_vma *anon_vma, struct file *file,
77811 pgoff_t pgoff, struct mempolicy *policy)
77812 {
77813 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
77814 struct vm_area_struct *area, *next;
77815
77816+#ifdef CONFIG_PAX_SEGMEXEC
77817+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
77818+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
77819+
77820+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
77821+#endif
77822+
77823 /*
77824 * We later require that vma->vm_flags == vm_flags,
77825 * so this tests vma->vm_flags & VM_SPECIAL, too.
77826@@ -786,6 +827,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
77827 if (next && next->vm_end == end) /* cases 6, 7, 8 */
77828 next = next->vm_next;
77829
77830+#ifdef CONFIG_PAX_SEGMEXEC
77831+ if (prev)
77832+ prev_m = pax_find_mirror_vma(prev);
77833+ if (area)
77834+ area_m = pax_find_mirror_vma(area);
77835+ if (next)
77836+ next_m = pax_find_mirror_vma(next);
77837+#endif
77838+
77839 /*
77840 * Can it merge with the predecessor?
77841 */
77842@@ -805,9 +855,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
77843 /* cases 1, 6 */
77844 vma_adjust(prev, prev->vm_start,
77845 next->vm_end, prev->vm_pgoff, NULL);
77846- } else /* cases 2, 5, 7 */
77847+
77848+#ifdef CONFIG_PAX_SEGMEXEC
77849+ if (prev_m)
77850+ vma_adjust(prev_m, prev_m->vm_start,
77851+ next_m->vm_end, prev_m->vm_pgoff, NULL);
77852+#endif
77853+
77854+ } else { /* cases 2, 5, 7 */
77855 vma_adjust(prev, prev->vm_start,
77856 end, prev->vm_pgoff, NULL);
77857+
77858+#ifdef CONFIG_PAX_SEGMEXEC
77859+ if (prev_m)
77860+ vma_adjust(prev_m, prev_m->vm_start,
77861+ end_m, prev_m->vm_pgoff, NULL);
77862+#endif
77863+
77864+ }
77865 return prev;
77866 }
77867
77868@@ -818,12 +883,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
77869 mpol_equal(policy, vma_policy(next)) &&
77870 can_vma_merge_before(next, vm_flags,
77871 anon_vma, file, pgoff+pglen)) {
77872- if (prev && addr < prev->vm_end) /* case 4 */
77873+ if (prev && addr < prev->vm_end) { /* case 4 */
77874 vma_adjust(prev, prev->vm_start,
77875 addr, prev->vm_pgoff, NULL);
77876- else /* cases 3, 8 */
77877+
77878+#ifdef CONFIG_PAX_SEGMEXEC
77879+ if (prev_m)
77880+ vma_adjust(prev_m, prev_m->vm_start,
77881+ addr_m, prev_m->vm_pgoff, NULL);
77882+#endif
77883+
77884+ } else { /* cases 3, 8 */
77885 vma_adjust(area, addr, next->vm_end,
77886 next->vm_pgoff - pglen, NULL);
77887+
77888+#ifdef CONFIG_PAX_SEGMEXEC
77889+ if (area_m)
77890+ vma_adjust(area_m, addr_m, next_m->vm_end,
77891+ next_m->vm_pgoff - pglen, NULL);
77892+#endif
77893+
77894+ }
77895 return area;
77896 }
77897
77898@@ -898,14 +978,11 @@ none:
77899 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
77900 struct file *file, long pages)
77901 {
77902- const unsigned long stack_flags
77903- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
77904-
77905 if (file) {
77906 mm->shared_vm += pages;
77907 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
77908 mm->exec_vm += pages;
77909- } else if (flags & stack_flags)
77910+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
77911 mm->stack_vm += pages;
77912 if (flags & (VM_RESERVED|VM_IO))
77913 mm->reserved_vm += pages;
77914@@ -932,7 +1009,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77915 * (the exception is when the underlying filesystem is noexec
77916 * mounted, in which case we dont add PROT_EXEC.)
77917 */
77918- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
77919+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
77920 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
77921 prot |= PROT_EXEC;
77922
77923@@ -958,7 +1035,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77924 /* Obtain the address to map to. we verify (or select) it and ensure
77925 * that it represents a valid section of the address space.
77926 */
77927- addr = get_unmapped_area(file, addr, len, pgoff, flags);
77928+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
77929 if (addr & ~PAGE_MASK)
77930 return addr;
77931
77932@@ -969,6 +1046,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77933 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
77934 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
77935
77936+#ifdef CONFIG_PAX_MPROTECT
77937+ if (mm->pax_flags & MF_PAX_MPROTECT) {
77938+#ifndef CONFIG_PAX_MPROTECT_COMPAT
77939+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
77940+ gr_log_rwxmmap(file);
77941+
77942+#ifdef CONFIG_PAX_EMUPLT
77943+ vm_flags &= ~VM_EXEC;
77944+#else
77945+ return -EPERM;
77946+#endif
77947+
77948+ }
77949+
77950+ if (!(vm_flags & VM_EXEC))
77951+ vm_flags &= ~VM_MAYEXEC;
77952+#else
77953+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
77954+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
77955+#endif
77956+ else
77957+ vm_flags &= ~VM_MAYWRITE;
77958+ }
77959+#endif
77960+
77961+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
77962+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
77963+ vm_flags &= ~VM_PAGEEXEC;
77964+#endif
77965+
77966 if (flags & MAP_LOCKED)
77967 if (!can_do_mlock())
77968 return -EPERM;
77969@@ -980,6 +1087,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77970 locked += mm->locked_vm;
77971 lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
77972 lock_limit >>= PAGE_SHIFT;
77973+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
77974 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
77975 return -EAGAIN;
77976 }
77977@@ -1053,6 +1161,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77978 if (error)
77979 return error;
77980
77981+ if (!gr_acl_handle_mmap(file, prot))
77982+ return -EACCES;
77983+
77984 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
77985 }
77986 EXPORT_SYMBOL(do_mmap_pgoff);
77987@@ -1065,10 +1176,10 @@ EXPORT_SYMBOL(do_mmap_pgoff);
77988 */
77989 int vma_wants_writenotify(struct vm_area_struct *vma)
77990 {
77991- unsigned int vm_flags = vma->vm_flags;
77992+ unsigned long vm_flags = vma->vm_flags;
77993
77994 /* If it was private or non-writable, the write bit is already clear */
77995- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
77996+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
77997 return 0;
77998
77999 /* The backer wishes to know when pages are first written to? */
78000@@ -1117,14 +1228,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
78001 unsigned long charged = 0;
78002 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
78003
78004+#ifdef CONFIG_PAX_SEGMEXEC
78005+ struct vm_area_struct *vma_m = NULL;
78006+#endif
78007+
78008+ /*
78009+ * mm->mmap_sem is required to protect against another thread
78010+ * changing the mappings in case we sleep.
78011+ */
78012+ verify_mm_writelocked(mm);
78013+
78014 /* Clear old maps */
78015 error = -ENOMEM;
78016-munmap_back:
78017 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
78018 if (vma && vma->vm_start < addr + len) {
78019 if (do_munmap(mm, addr, len))
78020 return -ENOMEM;
78021- goto munmap_back;
78022+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
78023+ BUG_ON(vma && vma->vm_start < addr + len);
78024 }
78025
78026 /* Check against address space limit. */
78027@@ -1173,6 +1294,16 @@ munmap_back:
78028 goto unacct_error;
78029 }
78030
78031+#ifdef CONFIG_PAX_SEGMEXEC
78032+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
78033+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
78034+ if (!vma_m) {
78035+ error = -ENOMEM;
78036+ goto free_vma;
78037+ }
78038+ }
78039+#endif
78040+
78041 vma->vm_mm = mm;
78042 vma->vm_start = addr;
78043 vma->vm_end = addr + len;
78044@@ -1195,6 +1326,19 @@ munmap_back:
78045 error = file->f_op->mmap(file, vma);
78046 if (error)
78047 goto unmap_and_free_vma;
78048+
78049+#ifdef CONFIG_PAX_SEGMEXEC
78050+ if (vma_m && (vm_flags & VM_EXECUTABLE))
78051+ added_exe_file_vma(mm);
78052+#endif
78053+
78054+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
78055+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
78056+ vma->vm_flags |= VM_PAGEEXEC;
78057+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
78058+ }
78059+#endif
78060+
78061 if (vm_flags & VM_EXECUTABLE)
78062 added_exe_file_vma(mm);
78063
78064@@ -1218,6 +1362,11 @@ munmap_back:
78065 vma_link(mm, vma, prev, rb_link, rb_parent);
78066 file = vma->vm_file;
78067
78068+#ifdef CONFIG_PAX_SEGMEXEC
78069+ if (vma_m)
78070+ pax_mirror_vma(vma_m, vma);
78071+#endif
78072+
78073 /* Once vma denies write, undo our temporary denial count */
78074 if (correct_wcount)
78075 atomic_inc(&inode->i_writecount);
78076@@ -1226,6 +1375,7 @@ out:
78077
78078 mm->total_vm += len >> PAGE_SHIFT;
78079 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
78080+ track_exec_limit(mm, addr, addr + len, vm_flags);
78081 if (vm_flags & VM_LOCKED) {
78082 /*
78083 * makes pages present; downgrades, drops, reacquires mmap_sem
78084@@ -1248,6 +1398,12 @@ unmap_and_free_vma:
78085 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
78086 charged = 0;
78087 free_vma:
78088+
78089+#ifdef CONFIG_PAX_SEGMEXEC
78090+ if (vma_m)
78091+ kmem_cache_free(vm_area_cachep, vma_m);
78092+#endif
78093+
78094 kmem_cache_free(vm_area_cachep, vma);
78095 unacct_error:
78096 if (charged)
78097@@ -1255,6 +1411,44 @@ unacct_error:
78098 return error;
78099 }
78100
78101+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
78102+{
78103+ if (!vma) {
78104+#ifdef CONFIG_STACK_GROWSUP
78105+ if (addr > sysctl_heap_stack_gap)
78106+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
78107+ else
78108+ vma = find_vma(current->mm, 0);
78109+ if (vma && (vma->vm_flags & VM_GROWSUP))
78110+ return false;
78111+#endif
78112+ return true;
78113+ }
78114+
78115+ if (addr + len > vma->vm_start)
78116+ return false;
78117+
78118+ if (vma->vm_flags & VM_GROWSDOWN)
78119+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
78120+#ifdef CONFIG_STACK_GROWSUP
78121+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
78122+ return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
78123+#endif
78124+
78125+ return true;
78126+}
78127+
78128+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
78129+{
78130+ if (vma->vm_start < len)
78131+ return -ENOMEM;
78132+ if (!(vma->vm_flags & VM_GROWSDOWN))
78133+ return vma->vm_start - len;
78134+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
78135+ return vma->vm_start - len - sysctl_heap_stack_gap;
78136+ return -ENOMEM;
78137+}
78138+
78139 /* Get an address range which is currently unmapped.
78140 * For shmat() with addr=0.
78141 *
78142@@ -1281,18 +1475,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
78143 if (flags & MAP_FIXED)
78144 return addr;
78145
78146+#ifdef CONFIG_PAX_RANDMMAP
78147+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
78148+#endif
78149+
78150 if (addr) {
78151 addr = PAGE_ALIGN(addr);
78152- vma = find_vma(mm, addr);
78153- if (TASK_SIZE - len >= addr &&
78154- (!vma || addr + len <= vma->vm_start))
78155- return addr;
78156+ if (TASK_SIZE - len >= addr) {
78157+ vma = find_vma(mm, addr);
78158+ if (check_heap_stack_gap(vma, addr, len))
78159+ return addr;
78160+ }
78161 }
78162 if (len > mm->cached_hole_size) {
78163- start_addr = addr = mm->free_area_cache;
78164+ start_addr = addr = mm->free_area_cache;
78165 } else {
78166- start_addr = addr = TASK_UNMAPPED_BASE;
78167- mm->cached_hole_size = 0;
78168+ start_addr = addr = mm->mmap_base;
78169+ mm->cached_hole_size = 0;
78170 }
78171
78172 full_search:
78173@@ -1303,34 +1502,40 @@ full_search:
78174 * Start a new search - just in case we missed
78175 * some holes.
78176 */
78177- if (start_addr != TASK_UNMAPPED_BASE) {
78178- addr = TASK_UNMAPPED_BASE;
78179- start_addr = addr;
78180+ if (start_addr != mm->mmap_base) {
78181+ start_addr = addr = mm->mmap_base;
78182 mm->cached_hole_size = 0;
78183 goto full_search;
78184 }
78185 return -ENOMEM;
78186 }
78187- if (!vma || addr + len <= vma->vm_start) {
78188- /*
78189- * Remember the place where we stopped the search:
78190- */
78191- mm->free_area_cache = addr + len;
78192- return addr;
78193- }
78194+ if (check_heap_stack_gap(vma, addr, len))
78195+ break;
78196 if (addr + mm->cached_hole_size < vma->vm_start)
78197 mm->cached_hole_size = vma->vm_start - addr;
78198 addr = vma->vm_end;
78199 }
78200+
78201+ /*
78202+ * Remember the place where we stopped the search:
78203+ */
78204+ mm->free_area_cache = addr + len;
78205+ return addr;
78206 }
78207 #endif
78208
78209 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
78210 {
78211+
78212+#ifdef CONFIG_PAX_SEGMEXEC
78213+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
78214+ return;
78215+#endif
78216+
78217 /*
78218 * Is this a new hole at the lowest possible address?
78219 */
78220- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) {
78221+ if (addr >= mm->mmap_base && addr < mm->free_area_cache) {
78222 mm->free_area_cache = addr;
78223 mm->cached_hole_size = ~0UL;
78224 }
78225@@ -1348,7 +1553,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
78226 {
78227 struct vm_area_struct *vma;
78228 struct mm_struct *mm = current->mm;
78229- unsigned long addr = addr0;
78230+ unsigned long base = mm->mmap_base, addr = addr0;
78231
78232 /* requested length too big for entire address space */
78233 if (len > TASK_SIZE)
78234@@ -1357,13 +1562,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
78235 if (flags & MAP_FIXED)
78236 return addr;
78237
78238+#ifdef CONFIG_PAX_RANDMMAP
78239+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
78240+#endif
78241+
78242 /* requesting a specific address */
78243 if (addr) {
78244 addr = PAGE_ALIGN(addr);
78245- vma = find_vma(mm, addr);
78246- if (TASK_SIZE - len >= addr &&
78247- (!vma || addr + len <= vma->vm_start))
78248- return addr;
78249+ if (TASK_SIZE - len >= addr) {
78250+ vma = find_vma(mm, addr);
78251+ if (check_heap_stack_gap(vma, addr, len))
78252+ return addr;
78253+ }
78254 }
78255
78256 /* check if free_area_cache is useful for us */
78257@@ -1378,7 +1588,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
78258 /* make sure it can fit in the remaining address space */
78259 if (addr > len) {
78260 vma = find_vma(mm, addr-len);
78261- if (!vma || addr <= vma->vm_start)
78262+ if (check_heap_stack_gap(vma, addr - len, len))
78263 /* remember the address as a hint for next time */
78264 return (mm->free_area_cache = addr-len);
78265 }
78266@@ -1395,7 +1605,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
78267 * return with success:
78268 */
78269 vma = find_vma(mm, addr);
78270- if (!vma || addr+len <= vma->vm_start)
78271+ if (check_heap_stack_gap(vma, addr, len))
78272 /* remember the address as a hint for next time */
78273 return (mm->free_area_cache = addr);
78274
78275@@ -1404,8 +1614,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
78276 mm->cached_hole_size = vma->vm_start - addr;
78277
78278 /* try just below the current vma->vm_start */
78279- addr = vma->vm_start-len;
78280- } while (len < vma->vm_start);
78281+ addr = skip_heap_stack_gap(vma, len);
78282+ } while (!IS_ERR_VALUE(addr));
78283
78284 bottomup:
78285 /*
78286@@ -1414,13 +1624,21 @@ bottomup:
78287 * can happen with large stack limits and large mmap()
78288 * allocations.
78289 */
78290+ mm->mmap_base = TASK_UNMAPPED_BASE;
78291+
78292+#ifdef CONFIG_PAX_RANDMMAP
78293+ if (mm->pax_flags & MF_PAX_RANDMMAP)
78294+ mm->mmap_base += mm->delta_mmap;
78295+#endif
78296+
78297+ mm->free_area_cache = mm->mmap_base;
78298 mm->cached_hole_size = ~0UL;
78299- mm->free_area_cache = TASK_UNMAPPED_BASE;
78300 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
78301 /*
78302 * Restore the topdown base:
78303 */
78304- mm->free_area_cache = mm->mmap_base;
78305+ mm->mmap_base = base;
78306+ mm->free_area_cache = base;
78307 mm->cached_hole_size = ~0UL;
78308
78309 return addr;
78310@@ -1429,6 +1647,12 @@ bottomup:
78311
78312 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
78313 {
78314+
78315+#ifdef CONFIG_PAX_SEGMEXEC
78316+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
78317+ return;
78318+#endif
78319+
78320 /*
78321 * Is this a new hole at the highest possible address?
78322 */
78323@@ -1436,8 +1660,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
78324 mm->free_area_cache = addr;
78325
78326 /* dont allow allocations above current base */
78327- if (mm->free_area_cache > mm->mmap_base)
78328+ if (mm->free_area_cache > mm->mmap_base) {
78329 mm->free_area_cache = mm->mmap_base;
78330+ mm->cached_hole_size = ~0UL;
78331+ }
78332 }
78333
78334 unsigned long
78335@@ -1545,6 +1771,27 @@ out:
78336 return prev ? prev->vm_next : vma;
78337 }
78338
78339+#ifdef CONFIG_PAX_SEGMEXEC
78340+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
78341+{
78342+ struct vm_area_struct *vma_m;
78343+
78344+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
78345+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
78346+ BUG_ON(vma->vm_mirror);
78347+ return NULL;
78348+ }
78349+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
78350+ vma_m = vma->vm_mirror;
78351+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
78352+ BUG_ON(vma->vm_file != vma_m->vm_file);
78353+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
78354+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff || vma->anon_vma != vma_m->anon_vma);
78355+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
78356+ return vma_m;
78357+}
78358+#endif
78359+
78360 /*
78361 * Verify that the stack growth is acceptable and
78362 * update accounting. This is shared with both the
78363@@ -1561,6 +1808,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
78364 return -ENOMEM;
78365
78366 /* Stack limit test */
78367+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
78368 if (size > rlim[RLIMIT_STACK].rlim_cur)
78369 return -ENOMEM;
78370
78371@@ -1570,6 +1818,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
78372 unsigned long limit;
78373 locked = mm->locked_vm + grow;
78374 limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
78375+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
78376 if (locked > limit && !capable(CAP_IPC_LOCK))
78377 return -ENOMEM;
78378 }
78379@@ -1600,37 +1849,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
78380 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
78381 * vma is the last one with address > vma->vm_end. Have to extend vma.
78382 */
78383+#ifndef CONFIG_IA64
78384+static
78385+#endif
78386 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
78387 {
78388 int error;
78389+ bool locknext;
78390
78391 if (!(vma->vm_flags & VM_GROWSUP))
78392 return -EFAULT;
78393
78394+ /* Also guard against wrapping around to address 0. */
78395+ if (address < PAGE_ALIGN(address+1))
78396+ address = PAGE_ALIGN(address+1);
78397+ else
78398+ return -ENOMEM;
78399+
78400 /*
78401 * We must make sure the anon_vma is allocated
78402 * so that the anon_vma locking is not a noop.
78403 */
78404 if (unlikely(anon_vma_prepare(vma)))
78405 return -ENOMEM;
78406+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
78407+ if (locknext && anon_vma_prepare(vma->vm_next))
78408+ return -ENOMEM;
78409 anon_vma_lock(vma);
78410+ if (locknext)
78411+ anon_vma_lock(vma->vm_next);
78412
78413 /*
78414 * vma->vm_start/vm_end cannot change under us because the caller
78415 * is required to hold the mmap_sem in read mode. We need the
78416- * anon_vma lock to serialize against concurrent expand_stacks.
78417- * Also guard against wrapping around to address 0.
78418+ * anon_vma locks to serialize against concurrent expand_stacks
78419+ * and expand_upwards.
78420 */
78421- if (address < PAGE_ALIGN(address+4))
78422- address = PAGE_ALIGN(address+4);
78423- else {
78424- anon_vma_unlock(vma);
78425- return -ENOMEM;
78426- }
78427 error = 0;
78428
78429 /* Somebody else might have raced and expanded it already */
78430- if (address > vma->vm_end) {
78431+ 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)
78432+ error = -ENOMEM;
78433+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
78434 unsigned long size, grow;
78435
78436 size = address - vma->vm_start;
78437@@ -1643,6 +1903,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
78438 vma->vm_end = address;
78439 }
78440 }
78441+ if (locknext)
78442+ anon_vma_unlock(vma->vm_next);
78443 anon_vma_unlock(vma);
78444 return error;
78445 }
78446@@ -1655,6 +1917,8 @@ static int expand_downwards(struct vm_area_struct *vma,
78447 unsigned long address)
78448 {
78449 int error;
78450+ bool lockprev = false;
78451+ struct vm_area_struct *prev;
78452
78453 /*
78454 * We must make sure the anon_vma is allocated
78455@@ -1668,6 +1932,15 @@ static int expand_downwards(struct vm_area_struct *vma,
78456 if (error)
78457 return error;
78458
78459+ prev = vma->vm_prev;
78460+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
78461+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
78462+#endif
78463+ if (lockprev && anon_vma_prepare(prev))
78464+ return -ENOMEM;
78465+ if (lockprev)
78466+ anon_vma_lock(prev);
78467+
78468 anon_vma_lock(vma);
78469
78470 /*
78471@@ -1677,9 +1950,17 @@ static int expand_downwards(struct vm_area_struct *vma,
78472 */
78473
78474 /* Somebody else might have raced and expanded it already */
78475- if (address < vma->vm_start) {
78476+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
78477+ error = -ENOMEM;
78478+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
78479 unsigned long size, grow;
78480
78481+#ifdef CONFIG_PAX_SEGMEXEC
78482+ struct vm_area_struct *vma_m;
78483+
78484+ vma_m = pax_find_mirror_vma(vma);
78485+#endif
78486+
78487 size = vma->vm_end - address;
78488 grow = (vma->vm_start - address) >> PAGE_SHIFT;
78489
78490@@ -1689,10 +1970,22 @@ static int expand_downwards(struct vm_area_struct *vma,
78491 if (!error) {
78492 vma->vm_start = address;
78493 vma->vm_pgoff -= grow;
78494+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
78495+
78496+#ifdef CONFIG_PAX_SEGMEXEC
78497+ if (vma_m) {
78498+ vma_m->vm_start -= grow << PAGE_SHIFT;
78499+ vma_m->vm_pgoff -= grow;
78500+ }
78501+#endif
78502+
78503+
78504 }
78505 }
78506 }
78507 anon_vma_unlock(vma);
78508+ if (lockprev)
78509+ anon_vma_unlock(prev);
78510 return error;
78511 }
78512
78513@@ -1768,6 +2061,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
78514 do {
78515 long nrpages = vma_pages(vma);
78516
78517+#ifdef CONFIG_PAX_SEGMEXEC
78518+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
78519+ vma = remove_vma(vma);
78520+ continue;
78521+ }
78522+#endif
78523+
78524 mm->total_vm -= nrpages;
78525 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
78526 vma = remove_vma(vma);
78527@@ -1813,6 +2113,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
78528 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
78529 vma->vm_prev = NULL;
78530 do {
78531+
78532+#ifdef CONFIG_PAX_SEGMEXEC
78533+ if (vma->vm_mirror) {
78534+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
78535+ vma->vm_mirror->vm_mirror = NULL;
78536+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
78537+ vma->vm_mirror = NULL;
78538+ }
78539+#endif
78540+
78541 rb_erase(&vma->vm_rb, &mm->mm_rb);
78542 mm->map_count--;
78543 tail_vma = vma;
78544@@ -1840,10 +2150,25 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
78545 struct mempolicy *pol;
78546 struct vm_area_struct *new;
78547
78548+#ifdef CONFIG_PAX_SEGMEXEC
78549+ struct vm_area_struct *vma_m, *new_m = NULL;
78550+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
78551+#endif
78552+
78553 if (is_vm_hugetlb_page(vma) && (addr &
78554 ~(huge_page_mask(hstate_vma(vma)))))
78555 return -EINVAL;
78556
78557+#ifdef CONFIG_PAX_SEGMEXEC
78558+ vma_m = pax_find_mirror_vma(vma);
78559+
78560+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
78561+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
78562+ if (mm->map_count >= sysctl_max_map_count-1)
78563+ return -ENOMEM;
78564+ } else
78565+#endif
78566+
78567 if (mm->map_count >= sysctl_max_map_count)
78568 return -ENOMEM;
78569
78570@@ -1851,6 +2176,16 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
78571 if (!new)
78572 return -ENOMEM;
78573
78574+#ifdef CONFIG_PAX_SEGMEXEC
78575+ if (vma_m) {
78576+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
78577+ if (!new_m) {
78578+ kmem_cache_free(vm_area_cachep, new);
78579+ return -ENOMEM;
78580+ }
78581+ }
78582+#endif
78583+
78584 /* most fields are the same, copy all, and then fixup */
78585 *new = *vma;
78586
78587@@ -1861,8 +2196,29 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
78588 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
78589 }
78590
78591+#ifdef CONFIG_PAX_SEGMEXEC
78592+ if (vma_m) {
78593+ *new_m = *vma_m;
78594+ new_m->vm_mirror = new;
78595+ new->vm_mirror = new_m;
78596+
78597+ if (new_below)
78598+ new_m->vm_end = addr_m;
78599+ else {
78600+ new_m->vm_start = addr_m;
78601+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
78602+ }
78603+ }
78604+#endif
78605+
78606 pol = mpol_dup(vma_policy(vma));
78607 if (IS_ERR(pol)) {
78608+
78609+#ifdef CONFIG_PAX_SEGMEXEC
78610+ if (new_m)
78611+ kmem_cache_free(vm_area_cachep, new_m);
78612+#endif
78613+
78614 kmem_cache_free(vm_area_cachep, new);
78615 return PTR_ERR(pol);
78616 }
78617@@ -1883,6 +2239,28 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
78618 else
78619 vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
78620
78621+#ifdef CONFIG_PAX_SEGMEXEC
78622+ if (vma_m) {
78623+ mpol_get(pol);
78624+ vma_set_policy(new_m, pol);
78625+
78626+ if (new_m->vm_file) {
78627+ get_file(new_m->vm_file);
78628+ if (vma_m->vm_flags & VM_EXECUTABLE)
78629+ added_exe_file_vma(mm);
78630+ }
78631+
78632+ if (new_m->vm_ops && new_m->vm_ops->open)
78633+ new_m->vm_ops->open(new_m);
78634+
78635+ if (new_below)
78636+ vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
78637+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
78638+ else
78639+ vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
78640+ }
78641+#endif
78642+
78643 return 0;
78644 }
78645
78646@@ -1891,11 +2269,30 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
78647 * work. This now handles partial unmappings.
78648 * Jeremy Fitzhardinge <jeremy@goop.org>
78649 */
78650+#ifdef CONFIG_PAX_SEGMEXEC
78651 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
78652 {
78653+ int ret = __do_munmap(mm, start, len);
78654+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
78655+ return ret;
78656+
78657+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
78658+}
78659+
78660+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
78661+#else
78662+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
78663+#endif
78664+{
78665 unsigned long end;
78666 struct vm_area_struct *vma, *prev, *last;
78667
78668+ /*
78669+ * mm->mmap_sem is required to protect against another thread
78670+ * changing the mappings in case we sleep.
78671+ */
78672+ verify_mm_writelocked(mm);
78673+
78674 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
78675 return -EINVAL;
78676
78677@@ -1959,6 +2356,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
78678 /* Fix up all other VM information */
78679 remove_vma_list(mm, vma);
78680
78681+ track_exec_limit(mm, start, end, 0UL);
78682+
78683 return 0;
78684 }
78685
78686@@ -1971,22 +2370,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
78687
78688 profile_munmap(addr);
78689
78690+#ifdef CONFIG_PAX_SEGMEXEC
78691+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
78692+ (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len))
78693+ return -EINVAL;
78694+#endif
78695+
78696 down_write(&mm->mmap_sem);
78697 ret = do_munmap(mm, addr, len);
78698 up_write(&mm->mmap_sem);
78699 return ret;
78700 }
78701
78702-static inline void verify_mm_writelocked(struct mm_struct *mm)
78703-{
78704-#ifdef CONFIG_DEBUG_VM
78705- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
78706- WARN_ON(1);
78707- up_read(&mm->mmap_sem);
78708- }
78709-#endif
78710-}
78711-
78712 /*
78713 * this is really a simplified "do_mmap". it only handles
78714 * anonymous maps. eventually we may be able to do some
78715@@ -2000,6 +2395,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
78716 struct rb_node ** rb_link, * rb_parent;
78717 pgoff_t pgoff = addr >> PAGE_SHIFT;
78718 int error;
78719+ unsigned long charged;
78720
78721 len = PAGE_ALIGN(len);
78722 if (!len)
78723@@ -2011,16 +2407,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
78724
78725 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
78726
78727+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
78728+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
78729+ flags &= ~VM_EXEC;
78730+
78731+#ifdef CONFIG_PAX_MPROTECT
78732+ if (mm->pax_flags & MF_PAX_MPROTECT)
78733+ flags &= ~VM_MAYEXEC;
78734+#endif
78735+
78736+ }
78737+#endif
78738+
78739 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
78740 if (error & ~PAGE_MASK)
78741 return error;
78742
78743+ charged = len >> PAGE_SHIFT;
78744+
78745 /*
78746 * mlock MCL_FUTURE?
78747 */
78748 if (mm->def_flags & VM_LOCKED) {
78749 unsigned long locked, lock_limit;
78750- locked = len >> PAGE_SHIFT;
78751+ locked = charged;
78752 locked += mm->locked_vm;
78753 lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
78754 lock_limit >>= PAGE_SHIFT;
78755@@ -2037,22 +2447,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
78756 /*
78757 * Clear old maps. this also does some error checking for us
78758 */
78759- munmap_back:
78760 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
78761 if (vma && vma->vm_start < addr + len) {
78762 if (do_munmap(mm, addr, len))
78763 return -ENOMEM;
78764- goto munmap_back;
78765+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
78766+ BUG_ON(vma && vma->vm_start < addr + len);
78767 }
78768
78769 /* Check against address space limits *after* clearing old maps... */
78770- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
78771+ if (!may_expand_vm(mm, charged))
78772 return -ENOMEM;
78773
78774 if (mm->map_count > sysctl_max_map_count)
78775 return -ENOMEM;
78776
78777- if (security_vm_enough_memory(len >> PAGE_SHIFT))
78778+ if (security_vm_enough_memory(charged))
78779 return -ENOMEM;
78780
78781 /* Can we just expand an old private anonymous mapping? */
78782@@ -2066,7 +2476,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
78783 */
78784 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
78785 if (!vma) {
78786- vm_unacct_memory(len >> PAGE_SHIFT);
78787+ vm_unacct_memory(charged);
78788 return -ENOMEM;
78789 }
78790
78791@@ -2078,11 +2488,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
78792 vma->vm_page_prot = vm_get_page_prot(flags);
78793 vma_link(mm, vma, prev, rb_link, rb_parent);
78794 out:
78795- mm->total_vm += len >> PAGE_SHIFT;
78796+ mm->total_vm += charged;
78797 if (flags & VM_LOCKED) {
78798 if (!mlock_vma_pages_range(vma, addr, addr + len))
78799- mm->locked_vm += (len >> PAGE_SHIFT);
78800+ mm->locked_vm += charged;
78801 }
78802+ track_exec_limit(mm, addr, addr + len, flags);
78803 return addr;
78804 }
78805
78806@@ -2129,8 +2540,10 @@ void exit_mmap(struct mm_struct *mm)
78807 * Walk the list again, actually closing and freeing it,
78808 * with preemption enabled, without holding any MM locks.
78809 */
78810- while (vma)
78811+ while (vma) {
78812+ vma->vm_mirror = NULL;
78813 vma = remove_vma(vma);
78814+ }
78815
78816 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
78817 }
78818@@ -2144,6 +2557,10 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
78819 struct vm_area_struct * __vma, * prev;
78820 struct rb_node ** rb_link, * rb_parent;
78821
78822+#ifdef CONFIG_PAX_SEGMEXEC
78823+ struct vm_area_struct *vma_m = NULL;
78824+#endif
78825+
78826 /*
78827 * The vm_pgoff of a purely anonymous vma should be irrelevant
78828 * until its first write fault, when page's anon_vma and index
78829@@ -2166,7 +2583,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
78830 if ((vma->vm_flags & VM_ACCOUNT) &&
78831 security_vm_enough_memory_mm(mm, vma_pages(vma)))
78832 return -ENOMEM;
78833+
78834+#ifdef CONFIG_PAX_SEGMEXEC
78835+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
78836+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
78837+ if (!vma_m)
78838+ return -ENOMEM;
78839+ }
78840+#endif
78841+
78842 vma_link(mm, vma, prev, rb_link, rb_parent);
78843+
78844+#ifdef CONFIG_PAX_SEGMEXEC
78845+ if (vma_m)
78846+ pax_mirror_vma(vma_m, vma);
78847+#endif
78848+
78849 return 0;
78850 }
78851
78852@@ -2184,6 +2616,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
78853 struct rb_node **rb_link, *rb_parent;
78854 struct mempolicy *pol;
78855
78856+ BUG_ON(vma->vm_mirror);
78857+
78858 /*
78859 * If anonymous vma has not yet been faulted, update new pgoff
78860 * to match new location, to increase its chance of merging.
78861@@ -2227,6 +2661,35 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
78862 return new_vma;
78863 }
78864
78865+#ifdef CONFIG_PAX_SEGMEXEC
78866+void pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
78867+{
78868+ struct vm_area_struct *prev_m;
78869+ struct rb_node **rb_link_m, *rb_parent_m;
78870+ struct mempolicy *pol_m;
78871+
78872+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
78873+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
78874+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
78875+ *vma_m = *vma;
78876+ pol_m = vma_policy(vma_m);
78877+ mpol_get(pol_m);
78878+ vma_set_policy(vma_m, pol_m);
78879+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
78880+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
78881+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
78882+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
78883+ if (vma_m->vm_file)
78884+ get_file(vma_m->vm_file);
78885+ if (vma_m->vm_ops && vma_m->vm_ops->open)
78886+ vma_m->vm_ops->open(vma_m);
78887+ find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
78888+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
78889+ vma_m->vm_mirror = vma;
78890+ vma->vm_mirror = vma_m;
78891+}
78892+#endif
78893+
78894 /*
78895 * Return true if the calling process may expand its vm space by the passed
78896 * number of pages
78897@@ -2237,7 +2700,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
78898 unsigned long lim;
78899
78900 lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
78901-
78902+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
78903 if (cur + npages > lim)
78904 return 0;
78905 return 1;
78906@@ -2307,6 +2770,22 @@ int install_special_mapping(struct mm_struct *mm,
78907 vma->vm_start = addr;
78908 vma->vm_end = addr + len;
78909
78910+#ifdef CONFIG_PAX_MPROTECT
78911+ if (mm->pax_flags & MF_PAX_MPROTECT) {
78912+#ifndef CONFIG_PAX_MPROTECT_COMPAT
78913+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
78914+ return -EPERM;
78915+ if (!(vm_flags & VM_EXEC))
78916+ vm_flags &= ~VM_MAYEXEC;
78917+#else
78918+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
78919+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
78920+#endif
78921+ else
78922+ vm_flags &= ~VM_MAYWRITE;
78923+ }
78924+#endif
78925+
78926 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
78927 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
78928
78929diff --git a/mm/mprotect.c b/mm/mprotect.c
78930index 1737c7e..c7faeb4 100644
78931--- a/mm/mprotect.c
78932+++ b/mm/mprotect.c
78933@@ -24,10 +24,16 @@
78934 #include <linux/mmu_notifier.h>
78935 #include <linux/migrate.h>
78936 #include <linux/perf_event.h>
78937+
78938+#ifdef CONFIG_PAX_MPROTECT
78939+#include <linux/elf.h>
78940+#endif
78941+
78942 #include <asm/uaccess.h>
78943 #include <asm/pgtable.h>
78944 #include <asm/cacheflush.h>
78945 #include <asm/tlbflush.h>
78946+#include <asm/mmu_context.h>
78947
78948 #ifndef pgprot_modify
78949 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
78950@@ -132,6 +138,48 @@ static void change_protection(struct vm_area_struct *vma,
78951 flush_tlb_range(vma, start, end);
78952 }
78953
78954+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
78955+/* called while holding the mmap semaphor for writing except stack expansion */
78956+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
78957+{
78958+ unsigned long oldlimit, newlimit = 0UL;
78959+
78960+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || nx_enabled)
78961+ return;
78962+
78963+ spin_lock(&mm->page_table_lock);
78964+ oldlimit = mm->context.user_cs_limit;
78965+ if ((prot & VM_EXEC) && oldlimit < end)
78966+ /* USER_CS limit moved up */
78967+ newlimit = end;
78968+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
78969+ /* USER_CS limit moved down */
78970+ newlimit = start;
78971+
78972+ if (newlimit) {
78973+ mm->context.user_cs_limit = newlimit;
78974+
78975+#ifdef CONFIG_SMP
78976+ wmb();
78977+ cpus_clear(mm->context.cpu_user_cs_mask);
78978+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
78979+#endif
78980+
78981+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
78982+ }
78983+ spin_unlock(&mm->page_table_lock);
78984+ if (newlimit == end) {
78985+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
78986+
78987+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
78988+ if (is_vm_hugetlb_page(vma))
78989+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
78990+ else
78991+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
78992+ }
78993+}
78994+#endif
78995+
78996 int
78997 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
78998 unsigned long start, unsigned long end, unsigned long newflags)
78999@@ -144,11 +192,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
79000 int error;
79001 int dirty_accountable = 0;
79002
79003+#ifdef CONFIG_PAX_SEGMEXEC
79004+ struct vm_area_struct *vma_m = NULL;
79005+ unsigned long start_m, end_m;
79006+
79007+ start_m = start + SEGMEXEC_TASK_SIZE;
79008+ end_m = end + SEGMEXEC_TASK_SIZE;
79009+#endif
79010+
79011 if (newflags == oldflags) {
79012 *pprev = vma;
79013 return 0;
79014 }
79015
79016+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
79017+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
79018+
79019+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
79020+ return -ENOMEM;
79021+
79022+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
79023+ return -ENOMEM;
79024+ }
79025+
79026 /*
79027 * If we make a private mapping writable we increase our commit;
79028 * but (without finer accounting) cannot reduce our commit if we
79029@@ -165,6 +231,38 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
79030 }
79031 }
79032
79033+#ifdef CONFIG_PAX_SEGMEXEC
79034+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
79035+ if (start != vma->vm_start) {
79036+ error = split_vma(mm, vma, start, 1);
79037+ if (error)
79038+ goto fail;
79039+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
79040+ *pprev = (*pprev)->vm_next;
79041+ }
79042+
79043+ if (end != vma->vm_end) {
79044+ error = split_vma(mm, vma, end, 0);
79045+ if (error)
79046+ goto fail;
79047+ }
79048+
79049+ if (pax_find_mirror_vma(vma)) {
79050+ error = __do_munmap(mm, start_m, end_m - start_m);
79051+ if (error)
79052+ goto fail;
79053+ } else {
79054+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
79055+ if (!vma_m) {
79056+ error = -ENOMEM;
79057+ goto fail;
79058+ }
79059+ vma->vm_flags = newflags;
79060+ pax_mirror_vma(vma_m, vma);
79061+ }
79062+ }
79063+#endif
79064+
79065 /*
79066 * First try to merge with previous and/or next vma.
79067 */
79068@@ -195,9 +293,21 @@ success:
79069 * vm_flags and vm_page_prot are protected by the mmap_sem
79070 * held in write mode.
79071 */
79072+
79073+#ifdef CONFIG_PAX_SEGMEXEC
79074+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
79075+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
79076+#endif
79077+
79078 vma->vm_flags = newflags;
79079+
79080+#ifdef CONFIG_PAX_MPROTECT
79081+ if (mm->binfmt && mm->binfmt->handle_mprotect)
79082+ mm->binfmt->handle_mprotect(vma, newflags);
79083+#endif
79084+
79085 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
79086- vm_get_page_prot(newflags));
79087+ vm_get_page_prot(vma->vm_flags));
79088
79089 if (vma_wants_writenotify(vma)) {
79090 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
79091@@ -239,6 +349,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
79092 end = start + len;
79093 if (end <= start)
79094 return -ENOMEM;
79095+
79096+#ifdef CONFIG_PAX_SEGMEXEC
79097+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
79098+ if (end > SEGMEXEC_TASK_SIZE)
79099+ return -EINVAL;
79100+ } else
79101+#endif
79102+
79103+ if (end > TASK_SIZE)
79104+ return -EINVAL;
79105+
79106 if (!arch_validate_prot(prot))
79107 return -EINVAL;
79108
79109@@ -246,7 +367,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
79110 /*
79111 * Does the application expect PROT_READ to imply PROT_EXEC:
79112 */
79113- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
79114+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
79115 prot |= PROT_EXEC;
79116
79117 vm_flags = calc_vm_prot_bits(prot);
79118@@ -278,6 +399,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
79119 if (start > vma->vm_start)
79120 prev = vma;
79121
79122+#ifdef CONFIG_PAX_MPROTECT
79123+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
79124+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
79125+#endif
79126+
79127 for (nstart = start ; ; ) {
79128 unsigned long newflags;
79129
79130@@ -287,6 +413,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
79131
79132 /* newflags >> 4 shift VM_MAY% in place of VM_% */
79133 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
79134+ if (prot & (PROT_WRITE | PROT_EXEC))
79135+ gr_log_rwxmprotect(vma->vm_file);
79136+
79137+ error = -EACCES;
79138+ goto out;
79139+ }
79140+
79141+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
79142 error = -EACCES;
79143 goto out;
79144 }
79145@@ -301,6 +435,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
79146 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
79147 if (error)
79148 goto out;
79149+
79150+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
79151+
79152 nstart = tmp;
79153
79154 if (nstart < prev->vm_end)
79155diff --git a/mm/mremap.c b/mm/mremap.c
79156index 3e98d79..1706cec 100644
79157--- a/mm/mremap.c
79158+++ b/mm/mremap.c
79159@@ -112,6 +112,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
79160 continue;
79161 pte = ptep_clear_flush(vma, old_addr, old_pte);
79162 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
79163+
79164+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
79165+ if (!nx_enabled && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
79166+ pte = pte_exprotect(pte);
79167+#endif
79168+
79169 set_pte_at(mm, new_addr, new_pte, pte);
79170 }
79171
79172@@ -271,6 +277,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
79173 if (is_vm_hugetlb_page(vma))
79174 goto Einval;
79175
79176+#ifdef CONFIG_PAX_SEGMEXEC
79177+ if (pax_find_mirror_vma(vma))
79178+ goto Einval;
79179+#endif
79180+
79181 /* We can't remap across vm area boundaries */
79182 if (old_len > vma->vm_end - addr)
79183 goto Efault;
79184@@ -327,20 +338,25 @@ static unsigned long mremap_to(unsigned long addr,
79185 unsigned long ret = -EINVAL;
79186 unsigned long charged = 0;
79187 unsigned long map_flags;
79188+ unsigned long pax_task_size = TASK_SIZE;
79189
79190 if (new_addr & ~PAGE_MASK)
79191 goto out;
79192
79193- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
79194+#ifdef CONFIG_PAX_SEGMEXEC
79195+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
79196+ pax_task_size = SEGMEXEC_TASK_SIZE;
79197+#endif
79198+
79199+ pax_task_size -= PAGE_SIZE;
79200+
79201+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
79202 goto out;
79203
79204 /* Check if the location we're moving into overlaps the
79205 * old location at all, and fail if it does.
79206 */
79207- if ((new_addr <= addr) && (new_addr+new_len) > addr)
79208- goto out;
79209-
79210- if ((addr <= new_addr) && (addr+old_len) > new_addr)
79211+ if (addr + old_len > new_addr && new_addr + new_len > addr)
79212 goto out;
79213
79214 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
79215@@ -412,6 +428,7 @@ unsigned long do_mremap(unsigned long addr,
79216 struct vm_area_struct *vma;
79217 unsigned long ret = -EINVAL;
79218 unsigned long charged = 0;
79219+ unsigned long pax_task_size = TASK_SIZE;
79220
79221 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
79222 goto out;
79223@@ -430,6 +447,17 @@ unsigned long do_mremap(unsigned long addr,
79224 if (!new_len)
79225 goto out;
79226
79227+#ifdef CONFIG_PAX_SEGMEXEC
79228+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
79229+ pax_task_size = SEGMEXEC_TASK_SIZE;
79230+#endif
79231+
79232+ pax_task_size -= PAGE_SIZE;
79233+
79234+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
79235+ old_len > pax_task_size || addr > pax_task_size-old_len)
79236+ goto out;
79237+
79238 if (flags & MREMAP_FIXED) {
79239 if (flags & MREMAP_MAYMOVE)
79240 ret = mremap_to(addr, old_len, new_addr, new_len);
79241@@ -476,6 +504,7 @@ unsigned long do_mremap(unsigned long addr,
79242 addr + new_len);
79243 }
79244 ret = addr;
79245+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
79246 goto out;
79247 }
79248 }
79249@@ -502,7 +531,13 @@ unsigned long do_mremap(unsigned long addr,
79250 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
79251 if (ret)
79252 goto out;
79253+
79254+ map_flags = vma->vm_flags;
79255 ret = move_vma(vma, addr, old_len, new_len, new_addr);
79256+ if (!(ret & ~PAGE_MASK)) {
79257+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
79258+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
79259+ }
79260 }
79261 out:
79262 if (ret & ~PAGE_MASK)
79263diff --git a/mm/nommu.c b/mm/nommu.c
79264index 406e8d4..53970d3 100644
79265--- a/mm/nommu.c
79266+++ b/mm/nommu.c
79267@@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
79268 int sysctl_overcommit_ratio = 50; /* default is 50% */
79269 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
79270 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
79271-int heap_stack_gap = 0;
79272
79273 atomic_long_t mmap_pages_allocated;
79274
79275@@ -761,15 +760,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
79276 EXPORT_SYMBOL(find_vma);
79277
79278 /*
79279- * find a VMA
79280- * - we don't extend stack VMAs under NOMMU conditions
79281- */
79282-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
79283-{
79284- return find_vma(mm, addr);
79285-}
79286-
79287-/*
79288 * expand a stack to a given address
79289 * - not supported under NOMMU conditions
79290 */
79291diff --git a/mm/page_alloc.c b/mm/page_alloc.c
79292index 3ecab7e..594a471 100644
79293--- a/mm/page_alloc.c
79294+++ b/mm/page_alloc.c
79295@@ -289,7 +289,7 @@ out:
79296 * This usage means that zero-order pages may not be compound.
79297 */
79298
79299-static void free_compound_page(struct page *page)
79300+void free_compound_page(struct page *page)
79301 {
79302 __free_pages_ok(page, compound_order(page));
79303 }
79304@@ -587,6 +587,10 @@ static void __free_pages_ok(struct page *page, unsigned int order)
79305 int bad = 0;
79306 int wasMlocked = __TestClearPageMlocked(page);
79307
79308+#ifdef CONFIG_PAX_MEMORY_SANITIZE
79309+ unsigned long index = 1UL << order;
79310+#endif
79311+
79312 kmemcheck_free_shadow(page, order);
79313
79314 for (i = 0 ; i < (1 << order) ; ++i)
79315@@ -599,6 +603,12 @@ static void __free_pages_ok(struct page *page, unsigned int order)
79316 debug_check_no_obj_freed(page_address(page),
79317 PAGE_SIZE << order);
79318 }
79319+
79320+#ifdef CONFIG_PAX_MEMORY_SANITIZE
79321+ for (; index; --index)
79322+ sanitize_highpage(page + index - 1);
79323+#endif
79324+
79325 arch_free_page(page, order);
79326 kernel_map_pages(page, 1 << order, 0);
79327
79328@@ -702,8 +712,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
79329 arch_alloc_page(page, order);
79330 kernel_map_pages(page, 1 << order, 1);
79331
79332+#ifndef CONFIG_PAX_MEMORY_SANITIZE
79333 if (gfp_flags & __GFP_ZERO)
79334 prep_zero_page(page, order, gfp_flags);
79335+#endif
79336
79337 if (order && (gfp_flags & __GFP_COMP))
79338 prep_compound_page(page, order);
79339@@ -1097,6 +1109,11 @@ static void free_hot_cold_page(struct page *page, int cold)
79340 debug_check_no_locks_freed(page_address(page), PAGE_SIZE);
79341 debug_check_no_obj_freed(page_address(page), PAGE_SIZE);
79342 }
79343+
79344+#ifdef CONFIG_PAX_MEMORY_SANITIZE
79345+ sanitize_highpage(page);
79346+#endif
79347+
79348 arch_free_page(page, 0);
79349 kernel_map_pages(page, 1, 0);
79350
79351@@ -2179,6 +2196,8 @@ void show_free_areas(void)
79352 int cpu;
79353 struct zone *zone;
79354
79355+ pax_track_stack();
79356+
79357 for_each_populated_zone(zone) {
79358 show_node(zone);
79359 printk("%s per-cpu:\n", zone->name);
79360@@ -3736,7 +3755,7 @@ static void __init setup_usemap(struct pglist_data *pgdat,
79361 zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
79362 }
79363 #else
79364-static void inline setup_usemap(struct pglist_data *pgdat,
79365+static inline void setup_usemap(struct pglist_data *pgdat,
79366 struct zone *zone, unsigned long zonesize) {}
79367 #endif /* CONFIG_SPARSEMEM */
79368
79369diff --git a/mm/percpu.c b/mm/percpu.c
79370index c90614a..5f7b7b8 100644
79371--- a/mm/percpu.c
79372+++ b/mm/percpu.c
79373@@ -115,7 +115,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
79374 static unsigned int pcpu_high_unit_cpu __read_mostly;
79375
79376 /* the address of the first chunk which starts with the kernel static area */
79377-void *pcpu_base_addr __read_mostly;
79378+void *pcpu_base_addr __read_only;
79379 EXPORT_SYMBOL_GPL(pcpu_base_addr);
79380
79381 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
79382diff --git a/mm/rmap.c b/mm/rmap.c
79383index dd43373..d848cd7 100644
79384--- a/mm/rmap.c
79385+++ b/mm/rmap.c
79386@@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_struct *vma)
79387 /* page_table_lock to protect against threads */
79388 spin_lock(&mm->page_table_lock);
79389 if (likely(!vma->anon_vma)) {
79390+
79391+#ifdef CONFIG_PAX_SEGMEXEC
79392+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
79393+
79394+ if (vma_m) {
79395+ BUG_ON(vma_m->anon_vma);
79396+ vma_m->anon_vma = anon_vma;
79397+ list_add_tail(&vma_m->anon_vma_node, &anon_vma->head);
79398+ }
79399+#endif
79400+
79401 vma->anon_vma = anon_vma;
79402 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
79403 allocated = NULL;
79404diff --git a/mm/shmem.c b/mm/shmem.c
79405index 3e0005b..1d659a8 100644
79406--- a/mm/shmem.c
79407+++ b/mm/shmem.c
79408@@ -31,7 +31,7 @@
79409 #include <linux/swap.h>
79410 #include <linux/ima.h>
79411
79412-static struct vfsmount *shm_mnt;
79413+struct vfsmount *shm_mnt;
79414
79415 #ifdef CONFIG_SHMEM
79416 /*
79417@@ -1061,6 +1061,8 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
79418 goto unlock;
79419 }
79420 entry = shmem_swp_entry(info, index, NULL);
79421+ if (!entry)
79422+ goto unlock;
79423 if (entry->val) {
79424 /*
79425 * The more uptodate page coming down from a stacked
79426@@ -1144,6 +1146,8 @@ static struct page *shmem_swapin(swp_entry_t entry, gfp_t gfp,
79427 struct vm_area_struct pvma;
79428 struct page *page;
79429
79430+ pax_track_stack();
79431+
79432 spol = mpol_cond_copy(&mpol,
79433 mpol_shared_policy_lookup(&info->policy, idx));
79434
79435@@ -1962,7 +1966,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s
79436
79437 info = SHMEM_I(inode);
79438 inode->i_size = len-1;
79439- if (len <= (char *)inode - (char *)info) {
79440+ if (len <= (char *)inode - (char *)info && len <= 64) {
79441 /* do it inline */
79442 memcpy(info, symname, len);
79443 inode->i_op = &shmem_symlink_inline_operations;
79444@@ -2310,8 +2314,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
79445 int err = -ENOMEM;
79446
79447 /* Round up to L1_CACHE_BYTES to resist false sharing */
79448- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
79449- L1_CACHE_BYTES), GFP_KERNEL);
79450+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
79451 if (!sbinfo)
79452 return -ENOMEM;
79453
79454diff --git a/mm/slab.c b/mm/slab.c
79455index c8d466a..909e01e 100644
79456--- a/mm/slab.c
79457+++ b/mm/slab.c
79458@@ -174,7 +174,7 @@
79459
79460 /* Legal flag mask for kmem_cache_create(). */
79461 #if DEBUG
79462-# define CREATE_MASK (SLAB_RED_ZONE | \
79463+# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
79464 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
79465 SLAB_CACHE_DMA | \
79466 SLAB_STORE_USER | \
79467@@ -182,7 +182,7 @@
79468 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
79469 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
79470 #else
79471-# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
79472+# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
79473 SLAB_CACHE_DMA | \
79474 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
79475 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
79476@@ -308,7 +308,7 @@ struct kmem_list3 {
79477 * Need this for bootstrapping a per node allocator.
79478 */
79479 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
79480-struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
79481+struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
79482 #define CACHE_CACHE 0
79483 #define SIZE_AC MAX_NUMNODES
79484 #define SIZE_L3 (2 * MAX_NUMNODES)
79485@@ -409,10 +409,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
79486 if ((x)->max_freeable < i) \
79487 (x)->max_freeable = i; \
79488 } while (0)
79489-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
79490-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
79491-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
79492-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
79493+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
79494+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
79495+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
79496+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
79497 #else
79498 #define STATS_INC_ACTIVE(x) do { } while (0)
79499 #define STATS_DEC_ACTIVE(x) do { } while (0)
79500@@ -558,7 +558,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
79501 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
79502 */
79503 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
79504- const struct slab *slab, void *obj)
79505+ const struct slab *slab, const void *obj)
79506 {
79507 u32 offset = (obj - slab->s_mem);
79508 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
79509@@ -1453,7 +1453,7 @@ void __init kmem_cache_init(void)
79510 sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
79511 sizes[INDEX_AC].cs_size,
79512 ARCH_KMALLOC_MINALIGN,
79513- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
79514+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
79515 NULL);
79516
79517 if (INDEX_AC != INDEX_L3) {
79518@@ -1461,7 +1461,7 @@ void __init kmem_cache_init(void)
79519 kmem_cache_create(names[INDEX_L3].name,
79520 sizes[INDEX_L3].cs_size,
79521 ARCH_KMALLOC_MINALIGN,
79522- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
79523+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
79524 NULL);
79525 }
79526
79527@@ -1479,7 +1479,7 @@ void __init kmem_cache_init(void)
79528 sizes->cs_cachep = kmem_cache_create(names->name,
79529 sizes->cs_size,
79530 ARCH_KMALLOC_MINALIGN,
79531- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
79532+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
79533 NULL);
79534 }
79535 #ifdef CONFIG_ZONE_DMA
79536@@ -4211,10 +4211,10 @@ static int s_show(struct seq_file *m, void *p)
79537 }
79538 /* cpu stats */
79539 {
79540- unsigned long allochit = atomic_read(&cachep->allochit);
79541- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
79542- unsigned long freehit = atomic_read(&cachep->freehit);
79543- unsigned long freemiss = atomic_read(&cachep->freemiss);
79544+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
79545+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
79546+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
79547+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
79548
79549 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
79550 allochit, allocmiss, freehit, freemiss);
79551@@ -4471,15 +4471,70 @@ static const struct file_operations proc_slabstats_operations = {
79552
79553 static int __init slab_proc_init(void)
79554 {
79555- proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
79556+ mode_t gr_mode = S_IRUGO;
79557+
79558+#ifdef CONFIG_GRKERNSEC_PROC_ADD
79559+ gr_mode = S_IRUSR;
79560+#endif
79561+
79562+ proc_create("slabinfo",S_IWUSR|gr_mode,NULL,&proc_slabinfo_operations);
79563 #ifdef CONFIG_DEBUG_SLAB_LEAK
79564- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
79565+ proc_create("slab_allocators", gr_mode, NULL, &proc_slabstats_operations);
79566 #endif
79567 return 0;
79568 }
79569 module_init(slab_proc_init);
79570 #endif
79571
79572+void check_object_size(const void *ptr, unsigned long n, bool to)
79573+{
79574+
79575+#ifdef CONFIG_PAX_USERCOPY
79576+ struct page *page;
79577+ struct kmem_cache *cachep = NULL;
79578+ struct slab *slabp;
79579+ unsigned int objnr;
79580+ unsigned long offset;
79581+ const char *type;
79582+
79583+ if (!n)
79584+ return;
79585+
79586+ type = "<null>";
79587+ if (ZERO_OR_NULL_PTR(ptr))
79588+ goto report;
79589+
79590+ if (!virt_addr_valid(ptr))
79591+ return;
79592+
79593+ page = virt_to_head_page(ptr);
79594+
79595+ type = "<process stack>";
79596+ if (!PageSlab(page)) {
79597+ if (object_is_on_stack(ptr, n) == -1)
79598+ goto report;
79599+ return;
79600+ }
79601+
79602+ cachep = page_get_cache(page);
79603+ type = cachep->name;
79604+ if (!(cachep->flags & SLAB_USERCOPY))
79605+ goto report;
79606+
79607+ slabp = page_get_slab(page);
79608+ objnr = obj_to_index(cachep, slabp, ptr);
79609+ BUG_ON(objnr >= cachep->num);
79610+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
79611+ if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
79612+ return;
79613+
79614+report:
79615+ pax_report_usercopy(ptr, n, to, type);
79616+#endif
79617+
79618+}
79619+EXPORT_SYMBOL(check_object_size);
79620+
79621 /**
79622 * ksize - get the actual amount of memory allocated for a given object
79623 * @objp: Pointer to the object
79624diff --git a/mm/slob.c b/mm/slob.c
79625index 837ebd6..0bd23bc 100644
79626--- a/mm/slob.c
79627+++ b/mm/slob.c
79628@@ -29,7 +29,7 @@
79629 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
79630 * alloc_pages() directly, allocating compound pages so the page order
79631 * does not have to be separately tracked, and also stores the exact
79632- * allocation size in page->private so that it can be used to accurately
79633+ * allocation size in slob_page->size so that it can be used to accurately
79634 * provide ksize(). These objects are detected in kfree() because slob_page()
79635 * is false for them.
79636 *
79637@@ -58,6 +58,7 @@
79638 */
79639
79640 #include <linux/kernel.h>
79641+#include <linux/sched.h>
79642 #include <linux/slab.h>
79643 #include <linux/mm.h>
79644 #include <linux/swap.h> /* struct reclaim_state */
79645@@ -100,7 +101,8 @@ struct slob_page {
79646 unsigned long flags; /* mandatory */
79647 atomic_t _count; /* mandatory */
79648 slobidx_t units; /* free units left in page */
79649- unsigned long pad[2];
79650+ unsigned long pad[1];
79651+ unsigned long size; /* size when >=PAGE_SIZE */
79652 slob_t *free; /* first free slob_t in page */
79653 struct list_head list; /* linked list of free pages */
79654 };
79655@@ -133,7 +135,7 @@ static LIST_HEAD(free_slob_large);
79656 */
79657 static inline int is_slob_page(struct slob_page *sp)
79658 {
79659- return PageSlab((struct page *)sp);
79660+ return PageSlab((struct page *)sp) && !sp->size;
79661 }
79662
79663 static inline void set_slob_page(struct slob_page *sp)
79664@@ -148,7 +150,7 @@ static inline void clear_slob_page(struct slob_page *sp)
79665
79666 static inline struct slob_page *slob_page(const void *addr)
79667 {
79668- return (struct slob_page *)virt_to_page(addr);
79669+ return (struct slob_page *)virt_to_head_page(addr);
79670 }
79671
79672 /*
79673@@ -208,7 +210,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
79674 /*
79675 * Return the size of a slob block.
79676 */
79677-static slobidx_t slob_units(slob_t *s)
79678+static slobidx_t slob_units(const slob_t *s)
79679 {
79680 if (s->units > 0)
79681 return s->units;
79682@@ -218,7 +220,7 @@ static slobidx_t slob_units(slob_t *s)
79683 /*
79684 * Return the next free slob block pointer after this one.
79685 */
79686-static slob_t *slob_next(slob_t *s)
79687+static slob_t *slob_next(const slob_t *s)
79688 {
79689 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
79690 slobidx_t next;
79691@@ -233,7 +235,7 @@ static slob_t *slob_next(slob_t *s)
79692 /*
79693 * Returns true if s is the last free block in its page.
79694 */
79695-static int slob_last(slob_t *s)
79696+static int slob_last(const slob_t *s)
79697 {
79698 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
79699 }
79700@@ -252,6 +254,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
79701 if (!page)
79702 return NULL;
79703
79704+ set_slob_page(page);
79705 return page_address(page);
79706 }
79707
79708@@ -368,11 +371,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
79709 if (!b)
79710 return NULL;
79711 sp = slob_page(b);
79712- set_slob_page(sp);
79713
79714 spin_lock_irqsave(&slob_lock, flags);
79715 sp->units = SLOB_UNITS(PAGE_SIZE);
79716 sp->free = b;
79717+ sp->size = 0;
79718 INIT_LIST_HEAD(&sp->list);
79719 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
79720 set_slob_page_free(sp, slob_list);
79721@@ -475,10 +478,9 @@ out:
79722 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long)
79723 #endif
79724
79725-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
79726+static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
79727 {
79728- unsigned int *m;
79729- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
79730+ slob_t *m;
79731 void *ret;
79732
79733 lockdep_trace_alloc(gfp);
79734@@ -491,7 +493,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
79735
79736 if (!m)
79737 return NULL;
79738- *m = size;
79739+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
79740+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
79741+ m[0].units = size;
79742+ m[1].units = align;
79743 ret = (void *)m + align;
79744
79745 trace_kmalloc_node(_RET_IP_, ret,
79746@@ -501,16 +506,25 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
79747
79748 ret = slob_new_pages(gfp | __GFP_COMP, get_order(size), node);
79749 if (ret) {
79750- struct page *page;
79751- page = virt_to_page(ret);
79752- page->private = size;
79753+ struct slob_page *sp;
79754+ sp = slob_page(ret);
79755+ sp->size = size;
79756 }
79757
79758 trace_kmalloc_node(_RET_IP_, ret,
79759 size, PAGE_SIZE << order, gfp, node);
79760 }
79761
79762- kmemleak_alloc(ret, size, 1, gfp);
79763+ return ret;
79764+}
79765+
79766+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
79767+{
79768+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
79769+ void *ret = __kmalloc_node_align(size, gfp, node, align);
79770+
79771+ if (!ZERO_OR_NULL_PTR(ret))
79772+ kmemleak_alloc(ret, size, 1, gfp);
79773 return ret;
79774 }
79775 EXPORT_SYMBOL(__kmalloc_node);
79776@@ -528,13 +542,92 @@ void kfree(const void *block)
79777 sp = slob_page(block);
79778 if (is_slob_page(sp)) {
79779 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
79780- unsigned int *m = (unsigned int *)(block - align);
79781- slob_free(m, *m + align);
79782- } else
79783+ slob_t *m = (slob_t *)(block - align);
79784+ slob_free(m, m[0].units + align);
79785+ } else {
79786+ clear_slob_page(sp);
79787+ free_slob_page(sp);
79788+ sp->size = 0;
79789 put_page(&sp->page);
79790+ }
79791 }
79792 EXPORT_SYMBOL(kfree);
79793
79794+void check_object_size(const void *ptr, unsigned long n, bool to)
79795+{
79796+
79797+#ifdef CONFIG_PAX_USERCOPY
79798+ struct slob_page *sp;
79799+ const slob_t *free;
79800+ const void *base;
79801+ unsigned long flags;
79802+ const char *type;
79803+
79804+ if (!n)
79805+ return;
79806+
79807+ type = "<null>";
79808+ if (ZERO_OR_NULL_PTR(ptr))
79809+ goto report;
79810+
79811+ if (!virt_addr_valid(ptr))
79812+ return;
79813+
79814+ type = "<process stack>";
79815+ sp = slob_page(ptr);
79816+ if (!PageSlab((struct page *)sp)) {
79817+ if (object_is_on_stack(ptr, n) == -1)
79818+ goto report;
79819+ return;
79820+ }
79821+
79822+ type = "<slob>";
79823+ if (sp->size) {
79824+ base = page_address(&sp->page);
79825+ if (base <= ptr && n <= sp->size - (ptr - base))
79826+ return;
79827+ goto report;
79828+ }
79829+
79830+ /* some tricky double walking to find the chunk */
79831+ spin_lock_irqsave(&slob_lock, flags);
79832+ base = (void *)((unsigned long)ptr & PAGE_MASK);
79833+ free = sp->free;
79834+
79835+ while (!slob_last(free) && (void *)free <= ptr) {
79836+ base = free + slob_units(free);
79837+ free = slob_next(free);
79838+ }
79839+
79840+ while (base < (void *)free) {
79841+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
79842+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
79843+ int offset;
79844+
79845+ if (ptr < base + align)
79846+ break;
79847+
79848+ offset = ptr - base - align;
79849+ if (offset >= m) {
79850+ base += size;
79851+ continue;
79852+ }
79853+
79854+ if (n > m - offset)
79855+ break;
79856+
79857+ spin_unlock_irqrestore(&slob_lock, flags);
79858+ return;
79859+ }
79860+
79861+ spin_unlock_irqrestore(&slob_lock, flags);
79862+report:
79863+ pax_report_usercopy(ptr, n, to, type);
79864+#endif
79865+
79866+}
79867+EXPORT_SYMBOL(check_object_size);
79868+
79869 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
79870 size_t ksize(const void *block)
79871 {
79872@@ -547,10 +640,10 @@ size_t ksize(const void *block)
79873 sp = slob_page(block);
79874 if (is_slob_page(sp)) {
79875 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
79876- unsigned int *m = (unsigned int *)(block - align);
79877- return SLOB_UNITS(*m) * SLOB_UNIT;
79878+ slob_t *m = (slob_t *)(block - align);
79879+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
79880 } else
79881- return sp->page.private;
79882+ return sp->size;
79883 }
79884 EXPORT_SYMBOL(ksize);
79885
79886@@ -566,8 +659,13 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
79887 {
79888 struct kmem_cache *c;
79889
79890+#ifdef CONFIG_PAX_USERCOPY
79891+ c = __kmalloc_node_align(sizeof(struct kmem_cache),
79892+ GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
79893+#else
79894 c = slob_alloc(sizeof(struct kmem_cache),
79895 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
79896+#endif
79897
79898 if (c) {
79899 c->name = name;
79900@@ -605,17 +703,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
79901 {
79902 void *b;
79903
79904+#ifdef CONFIG_PAX_USERCOPY
79905+ b = __kmalloc_node_align(c->size, flags, node, c->align);
79906+#else
79907 if (c->size < PAGE_SIZE) {
79908 b = slob_alloc(c->size, flags, c->align, node);
79909 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
79910 SLOB_UNITS(c->size) * SLOB_UNIT,
79911 flags, node);
79912 } else {
79913+ struct slob_page *sp;
79914+
79915 b = slob_new_pages(flags, get_order(c->size), node);
79916+ sp = slob_page(b);
79917+ sp->size = c->size;
79918 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
79919 PAGE_SIZE << get_order(c->size),
79920 flags, node);
79921 }
79922+#endif
79923
79924 if (c->ctor)
79925 c->ctor(b);
79926@@ -627,10 +733,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
79927
79928 static void __kmem_cache_free(void *b, int size)
79929 {
79930- if (size < PAGE_SIZE)
79931+ struct slob_page *sp = slob_page(b);
79932+
79933+ if (is_slob_page(sp))
79934 slob_free(b, size);
79935- else
79936+ else {
79937+ clear_slob_page(sp);
79938+ free_slob_page(sp);
79939+ sp->size = 0;
79940 slob_free_pages(b, get_order(size));
79941+ }
79942 }
79943
79944 static void kmem_rcu_free(struct rcu_head *head)
79945@@ -643,18 +755,32 @@ static void kmem_rcu_free(struct rcu_head *head)
79946
79947 void kmem_cache_free(struct kmem_cache *c, void *b)
79948 {
79949+ int size = c->size;
79950+
79951+#ifdef CONFIG_PAX_USERCOPY
79952+ if (size + c->align < PAGE_SIZE) {
79953+ size += c->align;
79954+ b -= c->align;
79955+ }
79956+#endif
79957+
79958 kmemleak_free_recursive(b, c->flags);
79959 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
79960 struct slob_rcu *slob_rcu;
79961- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
79962+ slob_rcu = b + (size - sizeof(struct slob_rcu));
79963 INIT_RCU_HEAD(&slob_rcu->head);
79964- slob_rcu->size = c->size;
79965+ slob_rcu->size = size;
79966 call_rcu(&slob_rcu->head, kmem_rcu_free);
79967 } else {
79968- __kmem_cache_free(b, c->size);
79969+ __kmem_cache_free(b, size);
79970 }
79971
79972+#ifdef CONFIG_PAX_USERCOPY
79973+ trace_kfree(_RET_IP_, b);
79974+#else
79975 trace_kmem_cache_free(_RET_IP_, b);
79976+#endif
79977+
79978 }
79979 EXPORT_SYMBOL(kmem_cache_free);
79980
79981diff --git a/mm/slub.c b/mm/slub.c
79982index 4996fc7..87e01d0 100644
79983--- a/mm/slub.c
79984+++ b/mm/slub.c
79985@@ -201,7 +201,7 @@ struct track {
79986
79987 enum track_item { TRACK_ALLOC, TRACK_FREE };
79988
79989-#ifdef CONFIG_SLUB_DEBUG
79990+#if defined(CONFIG_SLUB_DEBUG) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
79991 static int sysfs_slab_add(struct kmem_cache *);
79992 static int sysfs_slab_alias(struct kmem_cache *, const char *);
79993 static void sysfs_slab_remove(struct kmem_cache *);
79994@@ -410,7 +410,7 @@ static void print_track(const char *s, struct track *t)
79995 if (!t->addr)
79996 return;
79997
79998- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
79999+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
80000 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
80001 }
80002
80003@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
80004
80005 page = virt_to_head_page(x);
80006
80007+ BUG_ON(!PageSlab(page));
80008+
80009 slab_free(s, page, x, _RET_IP_);
80010
80011 trace_kmem_cache_free(_RET_IP_, x);
80012@@ -1937,7 +1939,7 @@ static int slub_min_objects;
80013 * Merge control. If this is set then no merging of slab caches will occur.
80014 * (Could be removed. This was introduced to pacify the merge skeptics.)
80015 */
80016-static int slub_nomerge;
80017+static int slub_nomerge = 1;
80018
80019 /*
80020 * Calculate the order of allocation given an slab object size.
80021@@ -2493,7 +2495,7 @@ static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags,
80022 * list to avoid pounding the page allocator excessively.
80023 */
80024 set_min_partial(s, ilog2(s->size));
80025- s->refcount = 1;
80026+ atomic_set(&s->refcount, 1);
80027 #ifdef CONFIG_NUMA
80028 s->remote_node_defrag_ratio = 1000;
80029 #endif
80030@@ -2630,8 +2632,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
80031 void kmem_cache_destroy(struct kmem_cache *s)
80032 {
80033 down_write(&slub_lock);
80034- s->refcount--;
80035- if (!s->refcount) {
80036+ if (atomic_dec_and_test(&s->refcount)) {
80037 list_del(&s->list);
80038 up_write(&slub_lock);
80039 if (kmem_cache_close(s)) {
80040@@ -2691,12 +2692,10 @@ static int __init setup_slub_nomerge(char *str)
80041 __setup("slub_nomerge", setup_slub_nomerge);
80042
80043 static struct kmem_cache *create_kmalloc_cache(struct kmem_cache *s,
80044- const char *name, int size, gfp_t gfp_flags)
80045+ const char *name, int size, gfp_t gfp_flags, unsigned int flags)
80046 {
80047- unsigned int flags = 0;
80048-
80049 if (gfp_flags & SLUB_DMA)
80050- flags = SLAB_CACHE_DMA;
80051+ flags |= SLAB_CACHE_DMA;
80052
80053 /*
80054 * This function is called with IRQs disabled during early-boot on
80055@@ -2915,6 +2914,50 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
80056 EXPORT_SYMBOL(__kmalloc_node);
80057 #endif
80058
80059+void check_object_size(const void *ptr, unsigned long n, bool to)
80060+{
80061+
80062+#ifdef CONFIG_PAX_USERCOPY
80063+ struct page *page;
80064+ struct kmem_cache *s = NULL;
80065+ unsigned long offset;
80066+ const char *type;
80067+
80068+ if (!n)
80069+ return;
80070+
80071+ type = "<null>";
80072+ if (ZERO_OR_NULL_PTR(ptr))
80073+ goto report;
80074+
80075+ if (!virt_addr_valid(ptr))
80076+ return;
80077+
80078+ page = get_object_page(ptr);
80079+
80080+ type = "<process stack>";
80081+ if (!page) {
80082+ if (object_is_on_stack(ptr, n) == -1)
80083+ goto report;
80084+ return;
80085+ }
80086+
80087+ s = page->slab;
80088+ type = s->name;
80089+ if (!(s->flags & SLAB_USERCOPY))
80090+ goto report;
80091+
80092+ offset = (ptr - page_address(page)) % s->size;
80093+ if (offset <= s->objsize && n <= s->objsize - offset)
80094+ return;
80095+
80096+report:
80097+ pax_report_usercopy(ptr, n, to, type);
80098+#endif
80099+
80100+}
80101+EXPORT_SYMBOL(check_object_size);
80102+
80103 size_t ksize(const void *object)
80104 {
80105 struct page *page;
80106@@ -3185,8 +3228,8 @@ void __init kmem_cache_init(void)
80107 * kmem_cache_open for slab_state == DOWN.
80108 */
80109 create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node",
80110- sizeof(struct kmem_cache_node), GFP_NOWAIT);
80111- kmalloc_caches[0].refcount = -1;
80112+ sizeof(struct kmem_cache_node), GFP_NOWAIT, 0);
80113+ atomic_set(&kmalloc_caches[0].refcount, -1);
80114 caches++;
80115
80116 hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
80117@@ -3198,18 +3241,18 @@ void __init kmem_cache_init(void)
80118 /* Caches that are not of the two-to-the-power-of size */
80119 if (KMALLOC_MIN_SIZE <= 32) {
80120 create_kmalloc_cache(&kmalloc_caches[1],
80121- "kmalloc-96", 96, GFP_NOWAIT);
80122+ "kmalloc-96", 96, GFP_NOWAIT, SLAB_USERCOPY);
80123 caches++;
80124 }
80125 if (KMALLOC_MIN_SIZE <= 64) {
80126 create_kmalloc_cache(&kmalloc_caches[2],
80127- "kmalloc-192", 192, GFP_NOWAIT);
80128+ "kmalloc-192", 192, GFP_NOWAIT, SLAB_USERCOPY);
80129 caches++;
80130 }
80131
80132 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
80133 create_kmalloc_cache(&kmalloc_caches[i],
80134- "kmalloc", 1 << i, GFP_NOWAIT);
80135+ "kmalloc", 1 << i, GFP_NOWAIT, SLAB_USERCOPY);
80136 caches++;
80137 }
80138
80139@@ -3293,7 +3336,7 @@ static int slab_unmergeable(struct kmem_cache *s)
80140 /*
80141 * We may have set a slab to be unmergeable during bootstrap.
80142 */
80143- if (s->refcount < 0)
80144+ if (atomic_read(&s->refcount) < 0)
80145 return 1;
80146
80147 return 0;
80148@@ -3353,7 +3396,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
80149 if (s) {
80150 int cpu;
80151
80152- s->refcount++;
80153+ atomic_inc(&s->refcount);
80154 /*
80155 * Adjust the object sizes so that we clear
80156 * the complete object on kzalloc.
80157@@ -3372,7 +3415,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
80158
80159 if (sysfs_slab_alias(s, name)) {
80160 down_write(&slub_lock);
80161- s->refcount--;
80162+ atomic_dec(&s->refcount);
80163 up_write(&slub_lock);
80164 goto err;
80165 }
80166@@ -4101,7 +4144,7 @@ SLAB_ATTR_RO(ctor);
80167
80168 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
80169 {
80170- return sprintf(buf, "%d\n", s->refcount - 1);
80171+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
80172 }
80173 SLAB_ATTR_RO(aliases);
80174
80175@@ -4503,7 +4546,7 @@ static void kmem_cache_release(struct kobject *kobj)
80176 kfree(s);
80177 }
80178
80179-static struct sysfs_ops slab_sysfs_ops = {
80180+static const struct sysfs_ops slab_sysfs_ops = {
80181 .show = slab_attr_show,
80182 .store = slab_attr_store,
80183 };
80184@@ -4522,7 +4565,7 @@ static int uevent_filter(struct kset *kset, struct kobject *kobj)
80185 return 0;
80186 }
80187
80188-static struct kset_uevent_ops slab_uevent_ops = {
80189+static const struct kset_uevent_ops slab_uevent_ops = {
80190 .filter = uevent_filter,
80191 };
80192
80193@@ -4564,6 +4607,7 @@ static char *create_unique_id(struct kmem_cache *s)
80194 return name;
80195 }
80196
80197+#if defined(CONFIG_SLUB_DEBUG) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
80198 static int sysfs_slab_add(struct kmem_cache *s)
80199 {
80200 int err;
80201@@ -4619,6 +4663,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
80202 kobject_del(&s->kobj);
80203 kobject_put(&s->kobj);
80204 }
80205+#endif
80206
80207 /*
80208 * Need to buffer aliases during bootup until sysfs becomes
80209@@ -4632,6 +4677,7 @@ struct saved_alias {
80210
80211 static struct saved_alias *alias_list;
80212
80213+#if defined(CONFIG_SLUB_DEBUG) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
80214 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
80215 {
80216 struct saved_alias *al;
80217@@ -4654,6 +4700,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
80218 alias_list = al;
80219 return 0;
80220 }
80221+#endif
80222
80223 static int __init slab_sysfs_init(void)
80224 {
80225@@ -4785,7 +4832,13 @@ static const struct file_operations proc_slabinfo_operations = {
80226
80227 static int __init slab_proc_init(void)
80228 {
80229- proc_create("slabinfo", S_IRUGO, NULL, &proc_slabinfo_operations);
80230+ mode_t gr_mode = S_IRUGO;
80231+
80232+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80233+ gr_mode = S_IRUSR;
80234+#endif
80235+
80236+ proc_create("slabinfo", gr_mode, NULL, &proc_slabinfo_operations);
80237 return 0;
80238 }
80239 module_init(slab_proc_init);
80240diff --git a/mm/swap.c b/mm/swap.c
80241index 308e57d..5de19c0 100644
80242--- a/mm/swap.c
80243+++ b/mm/swap.c
80244@@ -30,6 +30,7 @@
80245 #include <linux/notifier.h>
80246 #include <linux/backing-dev.h>
80247 #include <linux/memcontrol.h>
80248+#include <linux/hugetlb.h>
80249
80250 #include "internal.h"
80251
80252@@ -65,6 +66,8 @@ static void put_compound_page(struct page *page)
80253 compound_page_dtor *dtor;
80254
80255 dtor = get_compound_page_dtor(page);
80256+ if (!PageHuge(page))
80257+ BUG_ON(dtor != free_compound_page);
80258 (*dtor)(page);
80259 }
80260 }
80261diff --git a/mm/util.c b/mm/util.c
80262index e48b493..24a601d 100644
80263--- a/mm/util.c
80264+++ b/mm/util.c
80265@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
80266 void arch_pick_mmap_layout(struct mm_struct *mm)
80267 {
80268 mm->mmap_base = TASK_UNMAPPED_BASE;
80269+
80270+#ifdef CONFIG_PAX_RANDMMAP
80271+ if (mm->pax_flags & MF_PAX_RANDMMAP)
80272+ mm->mmap_base += mm->delta_mmap;
80273+#endif
80274+
80275 mm->get_unmapped_area = arch_get_unmapped_area;
80276 mm->unmap_area = arch_unmap_area;
80277 }
80278diff --git a/mm/vmalloc.c b/mm/vmalloc.c
80279index f34ffd0..e60c44f 100644
80280--- a/mm/vmalloc.c
80281+++ b/mm/vmalloc.c
80282@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
80283
80284 pte = pte_offset_kernel(pmd, addr);
80285 do {
80286- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
80287- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
80288+
80289+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
80290+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
80291+ BUG_ON(!pte_exec(*pte));
80292+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
80293+ continue;
80294+ }
80295+#endif
80296+
80297+ {
80298+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
80299+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
80300+ }
80301 } while (pte++, addr += PAGE_SIZE, addr != end);
80302 }
80303
80304@@ -92,6 +103,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
80305 unsigned long end, pgprot_t prot, struct page **pages, int *nr)
80306 {
80307 pte_t *pte;
80308+ int ret = -ENOMEM;
80309
80310 /*
80311 * nr is a running index into the array which helps higher level
80312@@ -101,17 +113,32 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
80313 pte = pte_alloc_kernel(pmd, addr);
80314 if (!pte)
80315 return -ENOMEM;
80316+
80317+ pax_open_kernel();
80318 do {
80319 struct page *page = pages[*nr];
80320
80321- if (WARN_ON(!pte_none(*pte)))
80322- return -EBUSY;
80323- if (WARN_ON(!page))
80324- return -ENOMEM;
80325+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
80326+ if (!(pgprot_val(prot) & _PAGE_NX))
80327+ BUG_ON(!pte_exec(*pte) || pte_pfn(*pte) != __pa(addr) >> PAGE_SHIFT);
80328+ else
80329+#endif
80330+
80331+ if (WARN_ON(!pte_none(*pte))) {
80332+ ret = -EBUSY;
80333+ goto out;
80334+ }
80335+ if (WARN_ON(!page)) {
80336+ ret = -ENOMEM;
80337+ goto out;
80338+ }
80339 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
80340 (*nr)++;
80341 } while (pte++, addr += PAGE_SIZE, addr != end);
80342- return 0;
80343+ ret = 0;
80344+out:
80345+ pax_close_kernel();
80346+ return ret;
80347 }
80348
80349 static int vmap_pmd_range(pud_t *pud, unsigned long addr,
80350@@ -192,11 +219,20 @@ int is_vmalloc_or_module_addr(const void *x)
80351 * and fall back on vmalloc() if that fails. Others
80352 * just put it in the vmalloc space.
80353 */
80354-#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
80355+#ifdef CONFIG_MODULES
80356+#ifdef MODULES_VADDR
80357 unsigned long addr = (unsigned long)x;
80358 if (addr >= MODULES_VADDR && addr < MODULES_END)
80359 return 1;
80360 #endif
80361+
80362+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
80363+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
80364+ return 1;
80365+#endif
80366+
80367+#endif
80368+
80369 return is_vmalloc_addr(x);
80370 }
80371
80372@@ -217,8 +253,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
80373
80374 if (!pgd_none(*pgd)) {
80375 pud_t *pud = pud_offset(pgd, addr);
80376+#ifdef CONFIG_X86
80377+ if (!pud_large(*pud))
80378+#endif
80379 if (!pud_none(*pud)) {
80380 pmd_t *pmd = pmd_offset(pud, addr);
80381+#ifdef CONFIG_X86
80382+ if (!pmd_large(*pmd))
80383+#endif
80384 if (!pmd_none(*pmd)) {
80385 pte_t *ptep, pte;
80386
80387@@ -292,13 +334,13 @@ static void __insert_vmap_area(struct vmap_area *va)
80388 struct rb_node *tmp;
80389
80390 while (*p) {
80391- struct vmap_area *tmp;
80392+ struct vmap_area *varea;
80393
80394 parent = *p;
80395- tmp = rb_entry(parent, struct vmap_area, rb_node);
80396- if (va->va_start < tmp->va_end)
80397+ varea = rb_entry(parent, struct vmap_area, rb_node);
80398+ if (va->va_start < varea->va_end)
80399 p = &(*p)->rb_left;
80400- else if (va->va_end > tmp->va_start)
80401+ else if (va->va_end > varea->va_start)
80402 p = &(*p)->rb_right;
80403 else
80404 BUG();
80405@@ -1245,6 +1287,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
80406 struct vm_struct *area;
80407
80408 BUG_ON(in_interrupt());
80409+
80410+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
80411+ if (flags & VM_KERNEXEC) {
80412+ if (start != VMALLOC_START || end != VMALLOC_END)
80413+ return NULL;
80414+ start = (unsigned long)MODULES_EXEC_VADDR;
80415+ end = (unsigned long)MODULES_EXEC_END;
80416+ }
80417+#endif
80418+
80419 if (flags & VM_IOREMAP) {
80420 int bit = fls(size);
80421
80422@@ -1484,6 +1536,11 @@ void *vmap(struct page **pages, unsigned int count,
80423 if (count > totalram_pages)
80424 return NULL;
80425
80426+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
80427+ if (!(pgprot_val(prot) & _PAGE_NX))
80428+ flags |= VM_KERNEXEC;
80429+#endif
80430+
80431 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
80432 __builtin_return_address(0));
80433 if (!area)
80434@@ -1594,6 +1651,14 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
80435 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
80436 return NULL;
80437
80438+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
80439+ if (!(pgprot_val(prot) & _PAGE_NX))
80440+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
80441+ VMALLOC_START, VMALLOC_END, node,
80442+ gfp_mask, caller);
80443+ else
80444+#endif
80445+
80446 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
80447 VMALLOC_START, VMALLOC_END, node,
80448 gfp_mask, caller);
80449@@ -1619,6 +1684,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
80450 return addr;
80451 }
80452
80453+#undef __vmalloc
80454 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
80455 {
80456 return __vmalloc_node(size, 1, gfp_mask, prot, -1,
80457@@ -1635,6 +1701,7 @@ EXPORT_SYMBOL(__vmalloc);
80458 * For tight control over page level allocator and protection flags
80459 * use __vmalloc() instead.
80460 */
80461+#undef vmalloc
80462 void *vmalloc(unsigned long size)
80463 {
80464 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
80465@@ -1649,6 +1716,7 @@ EXPORT_SYMBOL(vmalloc);
80466 * The resulting memory area is zeroed so it can be mapped to userspace
80467 * without leaking data.
80468 */
80469+#undef vmalloc_user
80470 void *vmalloc_user(unsigned long size)
80471 {
80472 struct vm_struct *area;
80473@@ -1676,6 +1744,7 @@ EXPORT_SYMBOL(vmalloc_user);
80474 * For tight control over page level allocator and protection flags
80475 * use __vmalloc() instead.
80476 */
80477+#undef vmalloc_node
80478 void *vmalloc_node(unsigned long size, int node)
80479 {
80480 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
80481@@ -1698,10 +1767,10 @@ EXPORT_SYMBOL(vmalloc_node);
80482 * For tight control over page level allocator and protection flags
80483 * use __vmalloc() instead.
80484 */
80485-
80486+#undef vmalloc_exec
80487 void *vmalloc_exec(unsigned long size)
80488 {
80489- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
80490+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
80491 -1, __builtin_return_address(0));
80492 }
80493
80494@@ -1720,6 +1789,7 @@ void *vmalloc_exec(unsigned long size)
80495 * Allocate enough 32bit PA addressable pages to cover @size from the
80496 * page level allocator and map them into contiguous kernel virtual space.
80497 */
80498+#undef vmalloc_32
80499 void *vmalloc_32(unsigned long size)
80500 {
80501 return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
80502@@ -1734,6 +1804,7 @@ EXPORT_SYMBOL(vmalloc_32);
80503 * The resulting memory area is 32bit addressable and zeroed so it can be
80504 * mapped to userspace without leaking data.
80505 */
80506+#undef vmalloc_32_user
80507 void *vmalloc_32_user(unsigned long size)
80508 {
80509 struct vm_struct *area;
80510@@ -1998,6 +2069,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
80511 unsigned long uaddr = vma->vm_start;
80512 unsigned long usize = vma->vm_end - vma->vm_start;
80513
80514+ BUG_ON(vma->vm_mirror);
80515+
80516 if ((PAGE_SIZE-1) & (unsigned long)addr)
80517 return -EINVAL;
80518
80519diff --git a/mm/vmstat.c b/mm/vmstat.c
80520index 42d76c6..5643dc4 100644
80521--- a/mm/vmstat.c
80522+++ b/mm/vmstat.c
80523@@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
80524 *
80525 * vm_stat contains the global counters
80526 */
80527-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
80528+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
80529 EXPORT_SYMBOL(vm_stat);
80530
80531 #ifdef CONFIG_SMP
80532@@ -324,7 +324,7 @@ void refresh_cpu_vm_stats(int cpu)
80533 v = p->vm_stat_diff[i];
80534 p->vm_stat_diff[i] = 0;
80535 local_irq_restore(flags);
80536- atomic_long_add(v, &zone->vm_stat[i]);
80537+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
80538 global_diff[i] += v;
80539 #ifdef CONFIG_NUMA
80540 /* 3 seconds idle till flush */
80541@@ -362,7 +362,7 @@ void refresh_cpu_vm_stats(int cpu)
80542
80543 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
80544 if (global_diff[i])
80545- atomic_long_add(global_diff[i], &vm_stat[i]);
80546+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
80547 }
80548
80549 #endif
80550@@ -953,10 +953,20 @@ static int __init setup_vmstat(void)
80551 start_cpu_timer(cpu);
80552 #endif
80553 #ifdef CONFIG_PROC_FS
80554- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
80555- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
80556- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
80557- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
80558+ {
80559+ mode_t gr_mode = S_IRUGO;
80560+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80561+ gr_mode = S_IRUSR;
80562+#endif
80563+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
80564+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
80565+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80566+ proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
80567+#else
80568+ proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
80569+#endif
80570+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
80571+ }
80572 #endif
80573 return 0;
80574 }
80575diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
80576index a29c5ab..6143f20 100644
80577--- a/net/8021q/vlan.c
80578+++ b/net/8021q/vlan.c
80579@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
80580 err = -EPERM;
80581 if (!capable(CAP_NET_ADMIN))
80582 break;
80583- if ((args.u.name_type >= 0) &&
80584- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
80585+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
80586 struct vlan_net *vn;
80587
80588 vn = net_generic(net, vlan_net_id);
80589diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
80590index a2d2984..f9eb711 100644
80591--- a/net/9p/trans_fd.c
80592+++ b/net/9p/trans_fd.c
80593@@ -419,7 +419,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
80594 oldfs = get_fs();
80595 set_fs(get_ds());
80596 /* The cast to a user pointer is valid due to the set_fs() */
80597- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
80598+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
80599 set_fs(oldfs);
80600
80601 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
80602diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
80603index 02cc7e7..4514f1b 100644
80604--- a/net/atm/atm_misc.c
80605+++ b/net/atm/atm_misc.c
80606@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int truesize)
80607 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
80608 return 1;
80609 atm_return(vcc,truesize);
80610- atomic_inc(&vcc->stats->rx_drop);
80611+ atomic_inc_unchecked(&vcc->stats->rx_drop);
80612 return 0;
80613 }
80614
80615@@ -41,7 +41,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
80616 }
80617 }
80618 atm_return(vcc,guess);
80619- atomic_inc(&vcc->stats->rx_drop);
80620+ atomic_inc_unchecked(&vcc->stats->rx_drop);
80621 return NULL;
80622 }
80623
80624@@ -88,7 +88,7 @@ int atm_pcr_goal(const struct atm_trafprm *tp)
80625
80626 void sonet_copy_stats(struct k_sonet_stats *from,struct sonet_stats *to)
80627 {
80628-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
80629+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
80630 __SONET_ITEMS
80631 #undef __HANDLE_ITEM
80632 }
80633@@ -96,7 +96,7 @@ void sonet_copy_stats(struct k_sonet_stats *from,struct sonet_stats *to)
80634
80635 void sonet_subtract_stats(struct k_sonet_stats *from,struct sonet_stats *to)
80636 {
80637-#define __HANDLE_ITEM(i) atomic_sub(to->i,&from->i)
80638+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
80639 __SONET_ITEMS
80640 #undef __HANDLE_ITEM
80641 }
80642diff --git a/net/atm/lec.h b/net/atm/lec.h
80643index 9d14d19..5c145f3 100644
80644--- a/net/atm/lec.h
80645+++ b/net/atm/lec.h
80646@@ -48,7 +48,7 @@ struct lane2_ops {
80647 const u8 *tlvs, u32 sizeoftlvs);
80648 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
80649 const u8 *tlvs, u32 sizeoftlvs);
80650-};
80651+} __no_const;
80652
80653 /*
80654 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
80655diff --git a/net/atm/mpc.h b/net/atm/mpc.h
80656index 0919a88..a23d54e 100644
80657--- a/net/atm/mpc.h
80658+++ b/net/atm/mpc.h
80659@@ -33,7 +33,7 @@ struct mpoa_client {
80660 struct mpc_parameters parameters; /* parameters for this client */
80661
80662 const struct net_device_ops *old_ops;
80663- struct net_device_ops new_ops;
80664+ net_device_ops_no_const new_ops;
80665 };
80666
80667
80668diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
80669index 4504a4b..1733f1e 100644
80670--- a/net/atm/mpoa_caches.c
80671+++ b/net/atm/mpoa_caches.c
80672@@ -498,6 +498,8 @@ static void clear_expired(struct mpoa_client *client)
80673 struct timeval now;
80674 struct k_message msg;
80675
80676+ pax_track_stack();
80677+
80678 do_gettimeofday(&now);
80679
80680 write_lock_irq(&client->egress_lock);
80681diff --git a/net/atm/proc.c b/net/atm/proc.c
80682index ab8419a..aa91497 100644
80683--- a/net/atm/proc.c
80684+++ b/net/atm/proc.c
80685@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
80686 const struct k_atm_aal_stats *stats)
80687 {
80688 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
80689- atomic_read(&stats->tx),atomic_read(&stats->tx_err),
80690- atomic_read(&stats->rx),atomic_read(&stats->rx_err),
80691- atomic_read(&stats->rx_drop));
80692+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
80693+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
80694+ atomic_read_unchecked(&stats->rx_drop));
80695 }
80696
80697 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
80698@@ -188,7 +188,12 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc)
80699 {
80700 struct sock *sk = sk_atm(vcc);
80701
80702+#ifdef CONFIG_GRKERNSEC_HIDESYM
80703+ seq_printf(seq, "%p ", NULL);
80704+#else
80705 seq_printf(seq, "%p ", vcc);
80706+#endif
80707+
80708 if (!vcc->dev)
80709 seq_printf(seq, "Unassigned ");
80710 else
80711@@ -214,7 +219,11 @@ static void svc_info(struct seq_file *seq, struct atm_vcc *vcc)
80712 {
80713 if (!vcc->dev)
80714 seq_printf(seq, sizeof(void *) == 4 ?
80715+#ifdef CONFIG_GRKERNSEC_HIDESYM
80716+ "N/A@%p%10s" : "N/A@%p%2s", NULL, "");
80717+#else
80718 "N/A@%p%10s" : "N/A@%p%2s", vcc, "");
80719+#endif
80720 else
80721 seq_printf(seq, "%3d %3d %5d ",
80722 vcc->dev->number, vcc->vpi, vcc->vci);
80723diff --git a/net/atm/resources.c b/net/atm/resources.c
80724index 56b7322..c48b84e 100644
80725--- a/net/atm/resources.c
80726+++ b/net/atm/resources.c
80727@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *dev)
80728 static void copy_aal_stats(struct k_atm_aal_stats *from,
80729 struct atm_aal_stats *to)
80730 {
80731-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
80732+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
80733 __AAL_STAT_ITEMS
80734 #undef __HANDLE_ITEM
80735 }
80736@@ -170,7 +170,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
80737 static void subtract_aal_stats(struct k_atm_aal_stats *from,
80738 struct atm_aal_stats *to)
80739 {
80740-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
80741+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
80742 __AAL_STAT_ITEMS
80743 #undef __HANDLE_ITEM
80744 }
80745diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
80746index 8567d47..bba2292 100644
80747--- a/net/bridge/br_private.h
80748+++ b/net/bridge/br_private.h
80749@@ -255,7 +255,7 @@ extern void br_ifinfo_notify(int event, struct net_bridge_port *port);
80750
80751 #ifdef CONFIG_SYSFS
80752 /* br_sysfs_if.c */
80753-extern struct sysfs_ops brport_sysfs_ops;
80754+extern const struct sysfs_ops brport_sysfs_ops;
80755 extern int br_sysfs_addif(struct net_bridge_port *p);
80756
80757 /* br_sysfs_br.c */
80758diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
80759index 9a52ac5..c97538e 100644
80760--- a/net/bridge/br_stp_if.c
80761+++ b/net/bridge/br_stp_if.c
80762@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridge *br)
80763 char *envp[] = { NULL };
80764
80765 if (br->stp_enabled == BR_USER_STP) {
80766- r = call_usermodehelper(BR_STP_PROG, argv, envp, 1);
80767+ r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC);
80768 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
80769 br->dev->name, r);
80770
80771diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
80772index 820643a..ce77fb3 100644
80773--- a/net/bridge/br_sysfs_if.c
80774+++ b/net/bridge/br_sysfs_if.c
80775@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobject * kobj,
80776 return ret;
80777 }
80778
80779-struct sysfs_ops brport_sysfs_ops = {
80780+const struct sysfs_ops brport_sysfs_ops = {
80781 .show = brport_show,
80782 .store = brport_store,
80783 };
80784diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
80785index d73d47f..72df42a 100644
80786--- a/net/bridge/netfilter/ebtables.c
80787+++ b/net/bridge/netfilter/ebtables.c
80788@@ -1337,6 +1337,8 @@ static int copy_everything_to_user(struct ebt_table *t, void __user *user,
80789 unsigned int entries_size, nentries;
80790 char *entries;
80791
80792+ pax_track_stack();
80793+
80794 if (cmd == EBT_SO_GET_ENTRIES) {
80795 entries_size = t->private->entries_size;
80796 nentries = t->private->nentries;
80797diff --git a/net/can/bcm.c b/net/can/bcm.c
80798index 2ffd2e0..72a7486 100644
80799--- a/net/can/bcm.c
80800+++ b/net/can/bcm.c
80801@@ -164,9 +164,15 @@ static int bcm_proc_show(struct seq_file *m, void *v)
80802 struct bcm_sock *bo = bcm_sk(sk);
80803 struct bcm_op *op;
80804
80805+#ifdef CONFIG_GRKERNSEC_HIDESYM
80806+ seq_printf(m, ">>> socket %p", NULL);
80807+ seq_printf(m, " / sk %p", NULL);
80808+ seq_printf(m, " / bo %p", NULL);
80809+#else
80810 seq_printf(m, ">>> socket %p", sk->sk_socket);
80811 seq_printf(m, " / sk %p", sk);
80812 seq_printf(m, " / bo %p", bo);
80813+#endif
80814 seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
80815 seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
80816 seq_printf(m, " <<<\n");
80817diff --git a/net/compat.c b/net/compat.c
80818index 9559afc..ccd74e1 100644
80819--- a/net/compat.c
80820+++ b/net/compat.c
80821@@ -69,9 +69,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
80822 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
80823 __get_user(kmsg->msg_flags, &umsg->msg_flags))
80824 return -EFAULT;
80825- kmsg->msg_name = compat_ptr(tmp1);
80826- kmsg->msg_iov = compat_ptr(tmp2);
80827- kmsg->msg_control = compat_ptr(tmp3);
80828+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
80829+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
80830+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
80831 return 0;
80832 }
80833
80834@@ -94,7 +94,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
80835 kern_msg->msg_name = NULL;
80836
80837 tot_len = iov_from_user_compat_to_kern(kern_iov,
80838- (struct compat_iovec __user *)kern_msg->msg_iov,
80839+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
80840 kern_msg->msg_iovlen);
80841 if (tot_len >= 0)
80842 kern_msg->msg_iov = kern_iov;
80843@@ -114,20 +114,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
80844
80845 #define CMSG_COMPAT_FIRSTHDR(msg) \
80846 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
80847- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
80848+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
80849 (struct compat_cmsghdr __user *)NULL)
80850
80851 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
80852 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
80853 (ucmlen) <= (unsigned long) \
80854 ((mhdr)->msg_controllen - \
80855- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
80856+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
80857
80858 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
80859 struct compat_cmsghdr __user *cmsg, int cmsg_len)
80860 {
80861 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
80862- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
80863+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
80864 msg->msg_controllen)
80865 return NULL;
80866 return (struct compat_cmsghdr __user *)ptr;
80867@@ -219,7 +219,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
80868 {
80869 struct compat_timeval ctv;
80870 struct compat_timespec cts[3];
80871- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
80872+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
80873 struct compat_cmsghdr cmhdr;
80874 int cmlen;
80875
80876@@ -271,7 +271,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
80877
80878 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
80879 {
80880- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
80881+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
80882 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
80883 int fdnum = scm->fp->count;
80884 struct file **fp = scm->fp->fp;
80885@@ -433,7 +433,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
80886 len = sizeof(ktime);
80887 old_fs = get_fs();
80888 set_fs(KERNEL_DS);
80889- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
80890+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
80891 set_fs(old_fs);
80892
80893 if (!err) {
80894@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
80895 case MCAST_JOIN_GROUP:
80896 case MCAST_LEAVE_GROUP:
80897 {
80898- struct compat_group_req __user *gr32 = (void *)optval;
80899+ struct compat_group_req __user *gr32 = (void __user *)optval;
80900 struct group_req __user *kgr =
80901 compat_alloc_user_space(sizeof(struct group_req));
80902 u32 interface;
80903@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
80904 case MCAST_BLOCK_SOURCE:
80905 case MCAST_UNBLOCK_SOURCE:
80906 {
80907- struct compat_group_source_req __user *gsr32 = (void *)optval;
80908+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
80909 struct group_source_req __user *kgsr = compat_alloc_user_space(
80910 sizeof(struct group_source_req));
80911 u32 interface;
80912@@ -612,7 +612,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
80913 }
80914 case MCAST_MSFILTER:
80915 {
80916- struct compat_group_filter __user *gf32 = (void *)optval;
80917+ struct compat_group_filter __user *gf32 = (void __user *)optval;
80918 struct group_filter __user *kgf;
80919 u32 interface, fmode, numsrc;
80920
80921diff --git a/net/core/dev.c b/net/core/dev.c
80922index 84a0705..575db4c 100644
80923--- a/net/core/dev.c
80924+++ b/net/core/dev.c
80925@@ -1047,10 +1047,14 @@ void dev_load(struct net *net, const char *name)
80926 if (no_module && capable(CAP_NET_ADMIN))
80927 no_module = request_module("netdev-%s", name);
80928 if (no_module && capable(CAP_SYS_MODULE)) {
80929+#ifdef CONFIG_GRKERNSEC_MODHARDEN
80930+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
80931+#else
80932 if (!request_module("%s", name))
80933 pr_err("Loading kernel module for a network device "
80934 "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
80935 "instead\n", name);
80936+#endif
80937 }
80938 }
80939 EXPORT_SYMBOL(dev_load);
80940@@ -1654,7 +1658,7 @@ static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
80941
80942 struct dev_gso_cb {
80943 void (*destructor)(struct sk_buff *skb);
80944-};
80945+} __no_const;
80946
80947 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
80948
80949@@ -2063,7 +2067,7 @@ int netif_rx_ni(struct sk_buff *skb)
80950 }
80951 EXPORT_SYMBOL(netif_rx_ni);
80952
80953-static void net_tx_action(struct softirq_action *h)
80954+static void net_tx_action(void)
80955 {
80956 struct softnet_data *sd = &__get_cpu_var(softnet_data);
80957
80958@@ -2827,7 +2831,7 @@ void netif_napi_del(struct napi_struct *napi)
80959 EXPORT_SYMBOL(netif_napi_del);
80960
80961
80962-static void net_rx_action(struct softirq_action *h)
80963+static void net_rx_action(void)
80964 {
80965 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
80966 unsigned long time_limit = jiffies + 2;
80967diff --git a/net/core/flow.c b/net/core/flow.c
80968index 9601587..8c4824e 100644
80969--- a/net/core/flow.c
80970+++ b/net/core/flow.c
80971@@ -35,11 +35,11 @@ struct flow_cache_entry {
80972 atomic_t *object_ref;
80973 };
80974
80975-atomic_t flow_cache_genid = ATOMIC_INIT(0);
80976+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
80977
80978 static u32 flow_hash_shift;
80979 #define flow_hash_size (1 << flow_hash_shift)
80980-static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables) = { NULL };
80981+static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables);
80982
80983 #define flow_table(cpu) (per_cpu(flow_tables, cpu))
80984
80985@@ -52,7 +52,7 @@ struct flow_percpu_info {
80986 u32 hash_rnd;
80987 int count;
80988 };
80989-static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info) = { 0 };
80990+static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info);
80991
80992 #define flow_hash_rnd_recalc(cpu) \
80993 (per_cpu(flow_hash_info, cpu).hash_rnd_recalc)
80994@@ -69,7 +69,7 @@ struct flow_flush_info {
80995 atomic_t cpuleft;
80996 struct completion completion;
80997 };
80998-static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets) = { NULL };
80999+static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets);
81000
81001 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
81002
81003@@ -190,7 +190,7 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
81004 if (fle->family == family &&
81005 fle->dir == dir &&
81006 flow_key_compare(key, &fle->key) == 0) {
81007- if (fle->genid == atomic_read(&flow_cache_genid)) {
81008+ if (fle->genid == atomic_read_unchecked(&flow_cache_genid)) {
81009 void *ret = fle->object;
81010
81011 if (ret)
81012@@ -228,7 +228,7 @@ nocache:
81013 err = resolver(net, key, family, dir, &obj, &obj_ref);
81014
81015 if (fle && !err) {
81016- fle->genid = atomic_read(&flow_cache_genid);
81017+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
81018
81019 if (fle->object)
81020 atomic_dec(fle->object_ref);
81021@@ -258,7 +258,7 @@ static void flow_cache_flush_tasklet(unsigned long data)
81022
81023 fle = flow_table(cpu)[i];
81024 for (; fle; fle = fle->next) {
81025- unsigned genid = atomic_read(&flow_cache_genid);
81026+ unsigned genid = atomic_read_unchecked(&flow_cache_genid);
81027
81028 if (!fle->object || fle->genid == genid)
81029 continue;
81030diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
81031index d4fd895..ac9b1e6 100644
81032--- a/net/core/rtnetlink.c
81033+++ b/net/core/rtnetlink.c
81034@@ -57,7 +57,7 @@ struct rtnl_link
81035 {
81036 rtnl_doit_func doit;
81037 rtnl_dumpit_func dumpit;
81038-};
81039+} __no_const;
81040
81041 static DEFINE_MUTEX(rtnl_mutex);
81042
81043diff --git a/net/core/scm.c b/net/core/scm.c
81044index d98eafc..1a190a9 100644
81045--- a/net/core/scm.c
81046+++ b/net/core/scm.c
81047@@ -191,7 +191,7 @@ error:
81048 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
81049 {
81050 struct cmsghdr __user *cm
81051- = (__force struct cmsghdr __user *)msg->msg_control;
81052+ = (struct cmsghdr __force_user *)msg->msg_control;
81053 struct cmsghdr cmhdr;
81054 int cmlen = CMSG_LEN(len);
81055 int err;
81056@@ -214,7 +214,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
81057 err = -EFAULT;
81058 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
81059 goto out;
81060- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
81061+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
81062 goto out;
81063 cmlen = CMSG_SPACE(len);
81064 if (msg->msg_controllen < cmlen)
81065@@ -229,7 +229,7 @@ out:
81066 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
81067 {
81068 struct cmsghdr __user *cm
81069- = (__force struct cmsghdr __user*)msg->msg_control;
81070+ = (struct cmsghdr __force_user *)msg->msg_control;
81071
81072 int fdmax = 0;
81073 int fdnum = scm->fp->count;
81074@@ -249,7 +249,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
81075 if (fdnum < fdmax)
81076 fdmax = fdnum;
81077
81078- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
81079+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
81080 i++, cmfptr++)
81081 {
81082 int new_fd;
81083diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c
81084index 45329d7..626aaa6 100644
81085--- a/net/core/secure_seq.c
81086+++ b/net/core/secure_seq.c
81087@@ -57,7 +57,7 @@ __u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
81088 EXPORT_SYMBOL(secure_tcpv6_sequence_number);
81089
81090 u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
81091- __be16 dport)
81092+ __be16 dport)
81093 {
81094 u32 secret[MD5_MESSAGE_BYTES / 4];
81095 u32 hash[MD5_DIGEST_WORDS];
81096@@ -71,7 +71,6 @@ u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
81097 secret[i] = net_secret[i];
81098
81099 md5_transform(hash, secret);
81100-
81101 return hash[0];
81102 }
81103 #endif
81104diff --git a/net/core/skbuff.c b/net/core/skbuff.c
81105index 025f924..70a71c4 100644
81106--- a/net/core/skbuff.c
81107+++ b/net/core/skbuff.c
81108@@ -1544,6 +1544,8 @@ int skb_splice_bits(struct sk_buff *skb, unsigned int offset,
81109 struct sk_buff *frag_iter;
81110 struct sock *sk = skb->sk;
81111
81112+ pax_track_stack();
81113+
81114 /*
81115 * __skb_splice_bits() only fails if the output has no room left,
81116 * so no point in going over the frag_list for the error case.
81117diff --git a/net/core/sock.c b/net/core/sock.c
81118index 6605e75..3acebda 100644
81119--- a/net/core/sock.c
81120+++ b/net/core/sock.c
81121@@ -864,11 +864,15 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
81122 break;
81123
81124 case SO_PEERCRED:
81125+ {
81126+ struct ucred peercred;
81127 if (len > sizeof(sk->sk_peercred))
81128 len = sizeof(sk->sk_peercred);
81129- if (copy_to_user(optval, &sk->sk_peercred, len))
81130+ peercred = sk->sk_peercred;
81131+ if (copy_to_user(optval, &peercred, len))
81132 return -EFAULT;
81133 goto lenout;
81134+ }
81135
81136 case SO_PEERNAME:
81137 {
81138@@ -1892,7 +1896,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
81139 */
81140 smp_wmb();
81141 atomic_set(&sk->sk_refcnt, 1);
81142- atomic_set(&sk->sk_drops, 0);
81143+ atomic_set_unchecked(&sk->sk_drops, 0);
81144 }
81145 EXPORT_SYMBOL(sock_init_data);
81146
81147diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
81148index 2036568..c55883d 100644
81149--- a/net/decnet/sysctl_net_decnet.c
81150+++ b/net/decnet/sysctl_net_decnet.c
81151@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
81152
81153 if (len > *lenp) len = *lenp;
81154
81155- if (copy_to_user(buffer, addr, len))
81156+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
81157 return -EFAULT;
81158
81159 *lenp = len;
81160@@ -327,7 +327,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
81161
81162 if (len > *lenp) len = *lenp;
81163
81164- if (copy_to_user(buffer, devname, len))
81165+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
81166 return -EFAULT;
81167
81168 *lenp = len;
81169diff --git a/net/econet/Kconfig b/net/econet/Kconfig
81170index 39a2d29..f39c0fe 100644
81171--- a/net/econet/Kconfig
81172+++ b/net/econet/Kconfig
81173@@ -4,7 +4,7 @@
81174
81175 config ECONET
81176 tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
81177- depends on EXPERIMENTAL && INET
81178+ depends on EXPERIMENTAL && INET && BROKEN
81179 ---help---
81180 Econet is a fairly old and slow networking protocol mainly used by
81181 Acorn computers to access file and print servers. It uses native
81182diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
81183index a413b1b..380849c 100644
81184--- a/net/ieee802154/dgram.c
81185+++ b/net/ieee802154/dgram.c
81186@@ -318,7 +318,7 @@ out:
81187 static int dgram_rcv_skb(struct sock *sk, struct sk_buff *skb)
81188 {
81189 if (sock_queue_rcv_skb(sk, skb) < 0) {
81190- atomic_inc(&sk->sk_drops);
81191+ atomic_inc_unchecked(&sk->sk_drops);
81192 kfree_skb(skb);
81193 return NET_RX_DROP;
81194 }
81195diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c
81196index 30e74ee..bfc6ee0 100644
81197--- a/net/ieee802154/raw.c
81198+++ b/net/ieee802154/raw.c
81199@@ -206,7 +206,7 @@ out:
81200 static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
81201 {
81202 if (sock_queue_rcv_skb(sk, skb) < 0) {
81203- atomic_inc(&sk->sk_drops);
81204+ atomic_inc_unchecked(&sk->sk_drops);
81205 kfree_skb(skb);
81206 return NET_RX_DROP;
81207 }
81208diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
81209index dba56d2..acee5d6 100644
81210--- a/net/ipv4/inet_diag.c
81211+++ b/net/ipv4/inet_diag.c
81212@@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct sock *sk,
81213 r->idiag_retrans = 0;
81214
81215 r->id.idiag_if = sk->sk_bound_dev_if;
81216+#ifdef CONFIG_GRKERNSEC_HIDESYM
81217+ r->id.idiag_cookie[0] = 0;
81218+ r->id.idiag_cookie[1] = 0;
81219+#else
81220 r->id.idiag_cookie[0] = (u32)(unsigned long)sk;
81221 r->id.idiag_cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
81222+#endif
81223
81224 r->id.idiag_sport = inet->sport;
81225 r->id.idiag_dport = inet->dport;
81226@@ -200,8 +205,15 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
81227 r->idiag_family = tw->tw_family;
81228 r->idiag_retrans = 0;
81229 r->id.idiag_if = tw->tw_bound_dev_if;
81230+
81231+#ifdef CONFIG_GRKERNSEC_HIDESYM
81232+ r->id.idiag_cookie[0] = 0;
81233+ r->id.idiag_cookie[1] = 0;
81234+#else
81235 r->id.idiag_cookie[0] = (u32)(unsigned long)tw;
81236 r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
81237+#endif
81238+
81239 r->id.idiag_sport = tw->tw_sport;
81240 r->id.idiag_dport = tw->tw_dport;
81241 r->id.idiag_src[0] = tw->tw_rcv_saddr;
81242@@ -284,12 +296,14 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
81243 if (sk == NULL)
81244 goto unlock;
81245
81246+#ifndef CONFIG_GRKERNSEC_HIDESYM
81247 err = -ESTALE;
81248 if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||
81249 req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&
81250 ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||
81251 (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))
81252 goto out;
81253+#endif
81254
81255 err = -ENOMEM;
81256 rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
81257@@ -579,8 +593,14 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
81258 r->idiag_retrans = req->retrans;
81259
81260 r->id.idiag_if = sk->sk_bound_dev_if;
81261+
81262+#ifdef CONFIG_GRKERNSEC_HIDESYM
81263+ r->id.idiag_cookie[0] = 0;
81264+ r->id.idiag_cookie[1] = 0;
81265+#else
81266 r->id.idiag_cookie[0] = (u32)(unsigned long)req;
81267 r->id.idiag_cookie[1] = (u32)(((unsigned long)req >> 31) >> 1);
81268+#endif
81269
81270 tmo = req->expires - jiffies;
81271 if (tmo < 0)
81272diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
81273index d717267..56de7e7 100644
81274--- a/net/ipv4/inet_hashtables.c
81275+++ b/net/ipv4/inet_hashtables.c
81276@@ -18,12 +18,15 @@
81277 #include <linux/sched.h>
81278 #include <linux/slab.h>
81279 #include <linux/wait.h>
81280+#include <linux/security.h>
81281
81282 #include <net/inet_connection_sock.h>
81283 #include <net/inet_hashtables.h>
81284 #include <net/secure_seq.h>
81285 #include <net/ip.h>
81286
81287+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
81288+
81289 /*
81290 * Allocate and initialize a new local port bind bucket.
81291 * The bindhash mutex for snum's hash chain must be held here.
81292@@ -491,6 +494,8 @@ ok:
81293 }
81294 spin_unlock(&head->lock);
81295
81296+ gr_update_task_in_ip_table(current, inet_sk(sk));
81297+
81298 if (tw) {
81299 inet_twsk_deschedule(tw, death_row);
81300 inet_twsk_put(tw);
81301diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
81302index 13b229f..6956484 100644
81303--- a/net/ipv4/inetpeer.c
81304+++ b/net/ipv4/inetpeer.c
81305@@ -367,6 +367,8 @@ struct inet_peer *inet_getpeer(__be32 daddr, int create)
81306 struct inet_peer *p, *n;
81307 struct inet_peer **stack[PEER_MAXDEPTH], ***stackptr;
81308
81309+ pax_track_stack();
81310+
81311 /* Look up for the address quickly. */
81312 read_lock_bh(&peer_pool_lock);
81313 p = lookup(daddr, NULL);
81314@@ -390,7 +392,7 @@ struct inet_peer *inet_getpeer(__be32 daddr, int create)
81315 return NULL;
81316 n->v4daddr = daddr;
81317 atomic_set(&n->refcnt, 1);
81318- atomic_set(&n->rid, 0);
81319+ atomic_set_unchecked(&n->rid, 0);
81320 n->ip_id_count = secure_ip_id(daddr);
81321 n->tcp_ts_stamp = 0;
81322
81323diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
81324index d3fe10b..feeafc9 100644
81325--- a/net/ipv4/ip_fragment.c
81326+++ b/net/ipv4/ip_fragment.c
81327@@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
81328 return 0;
81329
81330 start = qp->rid;
81331- end = atomic_inc_return(&peer->rid);
81332+ end = atomic_inc_return_unchecked(&peer->rid);
81333 qp->rid = end;
81334
81335 rc = qp->q.fragments && (end - start) > max;
81336diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
81337index e982b5c..f079d75 100644
81338--- a/net/ipv4/ip_sockglue.c
81339+++ b/net/ipv4/ip_sockglue.c
81340@@ -1015,6 +1015,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
81341 int val;
81342 int len;
81343
81344+ pax_track_stack();
81345+
81346 if (level != SOL_IP)
81347 return -EOPNOTSUPP;
81348
81349@@ -1173,7 +1175,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
81350 if (sk->sk_type != SOCK_STREAM)
81351 return -ENOPROTOOPT;
81352
81353- msg.msg_control = optval;
81354+ msg.msg_control = (void __force_kernel *)optval;
81355 msg.msg_controllen = len;
81356 msg.msg_flags = 0;
81357
81358diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
81359index f8d04c2..c1188f2 100644
81360--- a/net/ipv4/ipconfig.c
81361+++ b/net/ipv4/ipconfig.c
81362@@ -295,7 +295,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
81363
81364 mm_segment_t oldfs = get_fs();
81365 set_fs(get_ds());
81366- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
81367+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
81368 set_fs(oldfs);
81369 return res;
81370 }
81371@@ -306,7 +306,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
81372
81373 mm_segment_t oldfs = get_fs();
81374 set_fs(get_ds());
81375- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
81376+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
81377 set_fs(oldfs);
81378 return res;
81379 }
81380@@ -317,7 +317,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
81381
81382 mm_segment_t oldfs = get_fs();
81383 set_fs(get_ds());
81384- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
81385+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
81386 set_fs(oldfs);
81387 return res;
81388 }
81389diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
81390index c8b0cc3..4da5ae2 100644
81391--- a/net/ipv4/netfilter/arp_tables.c
81392+++ b/net/ipv4/netfilter/arp_tables.c
81393@@ -934,6 +934,7 @@ static int get_info(struct net *net, void __user *user, int *len, int compat)
81394 private = &tmp;
81395 }
81396 #endif
81397+ memset(&info, 0, sizeof(info));
81398 info.valid_hooks = t->valid_hooks;
81399 memcpy(info.hook_entry, private->hook_entry,
81400 sizeof(info.hook_entry));
81401diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
81402index c156db2..e772975 100644
81403--- a/net/ipv4/netfilter/ip_queue.c
81404+++ b/net/ipv4/netfilter/ip_queue.c
81405@@ -286,6 +286,9 @@ ipq_mangle_ipv4(ipq_verdict_msg_t *v, struct nf_queue_entry *e)
81406
81407 if (v->data_len < sizeof(*user_iph))
81408 return 0;
81409+ if (v->data_len > 65535)
81410+ return -EMSGSIZE;
81411+
81412 diff = v->data_len - e->skb->len;
81413 if (diff < 0) {
81414 if (pskb_trim(e->skb, v->data_len))
81415@@ -409,7 +412,8 @@ ipq_dev_drop(int ifindex)
81416 static inline void
81417 __ipq_rcv_skb(struct sk_buff *skb)
81418 {
81419- int status, type, pid, flags, nlmsglen, skblen;
81420+ int status, type, pid, flags;
81421+ unsigned int nlmsglen, skblen;
81422 struct nlmsghdr *nlh;
81423
81424 skblen = skb->len;
81425diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
81426index 0606db1..02e7e4c 100644
81427--- a/net/ipv4/netfilter/ip_tables.c
81428+++ b/net/ipv4/netfilter/ip_tables.c
81429@@ -1141,6 +1141,7 @@ static int get_info(struct net *net, void __user *user, int *len, int compat)
81430 private = &tmp;
81431 }
81432 #endif
81433+ memset(&info, 0, sizeof(info));
81434 info.valid_hooks = t->valid_hooks;
81435 memcpy(info.hook_entry, private->hook_entry,
81436 sizeof(info.hook_entry));
81437diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
81438index d9521f6..3c3eb25 100644
81439--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
81440+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
81441@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(struct asn1_ctx *ctx,
81442
81443 *len = 0;
81444
81445- *octets = kmalloc(eoc - ctx->pointer, GFP_ATOMIC);
81446+ *octets = kmalloc((eoc - ctx->pointer), GFP_ATOMIC);
81447 if (*octets == NULL) {
81448 if (net_ratelimit())
81449 printk("OOM in bsalg (%d)\n", __LINE__);
81450diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
81451index ab996f9..3da5f96 100644
81452--- a/net/ipv4/raw.c
81453+++ b/net/ipv4/raw.c
81454@@ -292,7 +292,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
81455 /* Charge it to the socket. */
81456
81457 if (sock_queue_rcv_skb(sk, skb) < 0) {
81458- atomic_inc(&sk->sk_drops);
81459+ atomic_inc_unchecked(&sk->sk_drops);
81460 kfree_skb(skb);
81461 return NET_RX_DROP;
81462 }
81463@@ -303,7 +303,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
81464 int raw_rcv(struct sock *sk, struct sk_buff *skb)
81465 {
81466 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
81467- atomic_inc(&sk->sk_drops);
81468+ atomic_inc_unchecked(&sk->sk_drops);
81469 kfree_skb(skb);
81470 return NET_RX_DROP;
81471 }
81472@@ -724,16 +724,23 @@ static int raw_init(struct sock *sk)
81473
81474 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
81475 {
81476+ struct icmp_filter filter;
81477+
81478+ if (optlen < 0)
81479+ return -EINVAL;
81480 if (optlen > sizeof(struct icmp_filter))
81481 optlen = sizeof(struct icmp_filter);
81482- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
81483+ if (copy_from_user(&filter, optval, optlen))
81484 return -EFAULT;
81485+ raw_sk(sk)->filter = filter;
81486+
81487 return 0;
81488 }
81489
81490 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
81491 {
81492 int len, ret = -EFAULT;
81493+ struct icmp_filter filter;
81494
81495 if (get_user(len, optlen))
81496 goto out;
81497@@ -743,8 +750,9 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
81498 if (len > sizeof(struct icmp_filter))
81499 len = sizeof(struct icmp_filter);
81500 ret = -EFAULT;
81501- if (put_user(len, optlen) ||
81502- copy_to_user(optval, &raw_sk(sk)->filter, len))
81503+ filter = raw_sk(sk)->filter;
81504+ if (put_user(len, optlen) || len > sizeof filter ||
81505+ copy_to_user(optval, &filter, len))
81506 goto out;
81507 ret = 0;
81508 out: return ret;
81509@@ -954,7 +962,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
81510 sk_wmem_alloc_get(sp),
81511 sk_rmem_alloc_get(sp),
81512 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
81513- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
81514+ atomic_read(&sp->sk_refcnt),
81515+#ifdef CONFIG_GRKERNSEC_HIDESYM
81516+ NULL,
81517+#else
81518+ sp,
81519+#endif
81520+ atomic_read_unchecked(&sp->sk_drops));
81521 }
81522
81523 static int raw_seq_show(struct seq_file *seq, void *v)
81524diff --git a/net/ipv4/route.c b/net/ipv4/route.c
81525index 58f141b..b759702 100644
81526--- a/net/ipv4/route.c
81527+++ b/net/ipv4/route.c
81528@@ -269,7 +269,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
81529
81530 static inline int rt_genid(struct net *net)
81531 {
81532- return atomic_read(&net->ipv4.rt_genid);
81533+ return atomic_read_unchecked(&net->ipv4.rt_genid);
81534 }
81535
81536 #ifdef CONFIG_PROC_FS
81537@@ -889,7 +889,7 @@ static void rt_cache_invalidate(struct net *net)
81538 unsigned char shuffle;
81539
81540 get_random_bytes(&shuffle, sizeof(shuffle));
81541- atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
81542+ atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
81543 }
81544
81545 /*
81546@@ -3357,7 +3357,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
81547
81548 static __net_init int rt_secret_timer_init(struct net *net)
81549 {
81550- atomic_set(&net->ipv4.rt_genid,
81551+ atomic_set_unchecked(&net->ipv4.rt_genid,
81552 (int) ((num_physpages ^ (num_physpages>>8)) ^
81553 (jiffies ^ (jiffies >> 7))));
81554
81555diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
81556index f095659..adc892a 100644
81557--- a/net/ipv4/tcp.c
81558+++ b/net/ipv4/tcp.c
81559@@ -2085,6 +2085,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
81560 int val;
81561 int err = 0;
81562
81563+ pax_track_stack();
81564+
81565 /* This is a string value all the others are int's */
81566 if (optname == TCP_CONGESTION) {
81567 char name[TCP_CA_NAME_MAX];
81568@@ -2355,6 +2357,8 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
81569 struct tcp_sock *tp = tcp_sk(sk);
81570 int val, len;
81571
81572+ pax_track_stack();
81573+
81574 if (get_user(len, optlen))
81575 return -EFAULT;
81576
81577diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
81578index 6fc7961..33bad4a 100644
81579--- a/net/ipv4/tcp_ipv4.c
81580+++ b/net/ipv4/tcp_ipv4.c
81581@@ -85,6 +85,9 @@
81582 int sysctl_tcp_tw_reuse __read_mostly;
81583 int sysctl_tcp_low_latency __read_mostly;
81584
81585+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81586+extern int grsec_enable_blackhole;
81587+#endif
81588
81589 #ifdef CONFIG_TCP_MD5SIG
81590 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
81591@@ -1543,6 +1546,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
81592 return 0;
81593
81594 reset:
81595+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81596+ if (!grsec_enable_blackhole)
81597+#endif
81598 tcp_v4_send_reset(rsk, skb);
81599 discard:
81600 kfree_skb(skb);
81601@@ -1604,12 +1610,20 @@ int tcp_v4_rcv(struct sk_buff *skb)
81602 TCP_SKB_CB(skb)->sacked = 0;
81603
81604 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
81605- if (!sk)
81606+ if (!sk) {
81607+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81608+ ret = 1;
81609+#endif
81610 goto no_tcp_socket;
81611+ }
81612
81613 process:
81614- if (sk->sk_state == TCP_TIME_WAIT)
81615+ if (sk->sk_state == TCP_TIME_WAIT) {
81616+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81617+ ret = 2;
81618+#endif
81619 goto do_time_wait;
81620+ }
81621
81622 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
81623 goto discard_and_relse;
81624@@ -1651,6 +1665,10 @@ no_tcp_socket:
81625 bad_packet:
81626 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
81627 } else {
81628+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81629+ if (!grsec_enable_blackhole || (ret == 1 &&
81630+ (skb->dev->flags & IFF_LOOPBACK)))
81631+#endif
81632 tcp_v4_send_reset(NULL, skb);
81633 }
81634
81635@@ -2238,7 +2256,11 @@ static void get_openreq4(struct sock *sk, struct request_sock *req,
81636 0, /* non standard timer */
81637 0, /* open_requests have no inode */
81638 atomic_read(&sk->sk_refcnt),
81639+#ifdef CONFIG_GRKERNSEC_HIDESYM
81640+ NULL,
81641+#else
81642 req,
81643+#endif
81644 len);
81645 }
81646
81647@@ -2280,7 +2302,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
81648 sock_i_uid(sk),
81649 icsk->icsk_probes_out,
81650 sock_i_ino(sk),
81651- atomic_read(&sk->sk_refcnt), sk,
81652+ atomic_read(&sk->sk_refcnt),
81653+#ifdef CONFIG_GRKERNSEC_HIDESYM
81654+ NULL,
81655+#else
81656+ sk,
81657+#endif
81658 jiffies_to_clock_t(icsk->icsk_rto),
81659 jiffies_to_clock_t(icsk->icsk_ack.ato),
81660 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
81661@@ -2308,7 +2335,13 @@ static void get_timewait4_sock(struct inet_timewait_sock *tw,
81662 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %p%n",
81663 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
81664 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
81665- atomic_read(&tw->tw_refcnt), tw, len);
81666+ atomic_read(&tw->tw_refcnt),
81667+#ifdef CONFIG_GRKERNSEC_HIDESYM
81668+ NULL,
81669+#else
81670+ tw,
81671+#endif
81672+ len);
81673 }
81674
81675 #define TMPSZ 150
81676diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
81677index 4c03598..e09a8e8 100644
81678--- a/net/ipv4/tcp_minisocks.c
81679+++ b/net/ipv4/tcp_minisocks.c
81680@@ -26,6 +26,10 @@
81681 #include <net/inet_common.h>
81682 #include <net/xfrm.h>
81683
81684+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81685+extern int grsec_enable_blackhole;
81686+#endif
81687+
81688 #ifdef CONFIG_SYSCTL
81689 #define SYNC_INIT 0 /* let the user enable it */
81690 #else
81691@@ -672,6 +676,10 @@ listen_overflow:
81692
81693 embryonic_reset:
81694 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
81695+
81696+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81697+ if (!grsec_enable_blackhole)
81698+#endif
81699 if (!(flg & TCP_FLAG_RST))
81700 req->rsk_ops->send_reset(sk, skb);
81701
81702diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
81703index af83bdf..ec91cb2 100644
81704--- a/net/ipv4/tcp_output.c
81705+++ b/net/ipv4/tcp_output.c
81706@@ -2234,6 +2234,8 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
81707 __u8 *md5_hash_location;
81708 int mss;
81709
81710+ pax_track_stack();
81711+
81712 skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15, 1, GFP_ATOMIC);
81713 if (skb == NULL)
81714 return NULL;
81715diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
81716index 59f5b5e..193860f 100644
81717--- a/net/ipv4/tcp_probe.c
81718+++ b/net/ipv4/tcp_probe.c
81719@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
81720 if (cnt + width >= len)
81721 break;
81722
81723- if (copy_to_user(buf + cnt, tbuf, width))
81724+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
81725 return -EFAULT;
81726 cnt += width;
81727 }
81728diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
81729index 57d5501..a9ed13a 100644
81730--- a/net/ipv4/tcp_timer.c
81731+++ b/net/ipv4/tcp_timer.c
81732@@ -21,6 +21,10 @@
81733 #include <linux/module.h>
81734 #include <net/tcp.h>
81735
81736+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81737+extern int grsec_lastack_retries;
81738+#endif
81739+
81740 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
81741 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
81742 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
81743@@ -164,6 +168,13 @@ static int tcp_write_timeout(struct sock *sk)
81744 }
81745 }
81746
81747+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81748+ if ((sk->sk_state == TCP_LAST_ACK) &&
81749+ (grsec_lastack_retries > 0) &&
81750+ (grsec_lastack_retries < retry_until))
81751+ retry_until = grsec_lastack_retries;
81752+#endif
81753+
81754 if (retransmits_timed_out(sk, retry_until)) {
81755 /* Has it gone just too far? */
81756 tcp_write_err(sk);
81757diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
81758index 8e28770..72105c8 100644
81759--- a/net/ipv4/udp.c
81760+++ b/net/ipv4/udp.c
81761@@ -86,6 +86,7 @@
81762 #include <linux/types.h>
81763 #include <linux/fcntl.h>
81764 #include <linux/module.h>
81765+#include <linux/security.h>
81766 #include <linux/socket.h>
81767 #include <linux/sockios.h>
81768 #include <linux/igmp.h>
81769@@ -106,6 +107,10 @@
81770 #include <net/xfrm.h>
81771 #include "udp_impl.h"
81772
81773+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81774+extern int grsec_enable_blackhole;
81775+#endif
81776+
81777 struct udp_table udp_table;
81778 EXPORT_SYMBOL(udp_table);
81779
81780@@ -371,6 +376,9 @@ found:
81781 return s;
81782 }
81783
81784+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
81785+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
81786+
81787 /*
81788 * This routine is called by the ICMP module when it gets some
81789 * sort of error condition. If err < 0 then the socket should
81790@@ -639,9 +647,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
81791 dport = usin->sin_port;
81792 if (dport == 0)
81793 return -EINVAL;
81794+
81795+ err = gr_search_udp_sendmsg(sk, usin);
81796+ if (err)
81797+ return err;
81798 } else {
81799 if (sk->sk_state != TCP_ESTABLISHED)
81800 return -EDESTADDRREQ;
81801+
81802+ err = gr_search_udp_sendmsg(sk, NULL);
81803+ if (err)
81804+ return err;
81805+
81806 daddr = inet->daddr;
81807 dport = inet->dport;
81808 /* Open fast path for connected socket.
81809@@ -945,6 +962,10 @@ try_again:
81810 if (!skb)
81811 goto out;
81812
81813+ err = gr_search_udp_recvmsg(sk, skb);
81814+ if (err)
81815+ goto out_free;
81816+
81817 ulen = skb->len - sizeof(struct udphdr);
81818 copied = len;
81819 if (copied > ulen)
81820@@ -1068,7 +1089,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
81821 if (rc == -ENOMEM) {
81822 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
81823 is_udplite);
81824- atomic_inc(&sk->sk_drops);
81825+ atomic_inc_unchecked(&sk->sk_drops);
81826 }
81827 goto drop;
81828 }
81829@@ -1338,6 +1359,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
81830 goto csum_error;
81831
81832 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
81833+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81834+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
81835+#endif
81836 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
81837
81838 /*
81839@@ -1758,8 +1782,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
81840 sk_wmem_alloc_get(sp),
81841 sk_rmem_alloc_get(sp),
81842 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
81843- atomic_read(&sp->sk_refcnt), sp,
81844- atomic_read(&sp->sk_drops), len);
81845+ atomic_read(&sp->sk_refcnt),
81846+#ifdef CONFIG_GRKERNSEC_HIDESYM
81847+ NULL,
81848+#else
81849+ sp,
81850+#endif
81851+ atomic_read_unchecked(&sp->sk_drops), len);
81852 }
81853
81854 int udp4_seq_show(struct seq_file *seq, void *v)
81855diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
81856index 8ac3d09..fc58c5f 100644
81857--- a/net/ipv6/addrconf.c
81858+++ b/net/ipv6/addrconf.c
81859@@ -2053,7 +2053,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
81860 p.iph.ihl = 5;
81861 p.iph.protocol = IPPROTO_IPV6;
81862 p.iph.ttl = 64;
81863- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
81864+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
81865
81866 if (ops->ndo_do_ioctl) {
81867 mm_segment_t oldfs = get_fs();
81868diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
81869index cc4797d..7cfdfcc 100644
81870--- a/net/ipv6/inet6_connection_sock.c
81871+++ b/net/ipv6/inet6_connection_sock.c
81872@@ -152,7 +152,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
81873 #ifdef CONFIG_XFRM
81874 {
81875 struct rt6_info *rt = (struct rt6_info *)dst;
81876- rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
81877+ rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
81878 }
81879 #endif
81880 }
81881@@ -167,7 +167,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
81882 #ifdef CONFIG_XFRM
81883 if (dst) {
81884 struct rt6_info *rt = (struct rt6_info *)dst;
81885- if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
81886+ if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
81887 sk->sk_dst_cache = NULL;
81888 dst_release(dst);
81889 dst = NULL;
81890diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
81891index 093e9b2..f72cddb 100644
81892--- a/net/ipv6/inet6_hashtables.c
81893+++ b/net/ipv6/inet6_hashtables.c
81894@@ -119,7 +119,7 @@ out:
81895 }
81896 EXPORT_SYMBOL(__inet6_lookup_established);
81897
81898-static int inline compute_score(struct sock *sk, struct net *net,
81899+static inline int compute_score(struct sock *sk, struct net *net,
81900 const unsigned short hnum,
81901 const struct in6_addr *daddr,
81902 const int dif)
81903diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
81904index 4f7aaf6..f7acf45 100644
81905--- a/net/ipv6/ipv6_sockglue.c
81906+++ b/net/ipv6/ipv6_sockglue.c
81907@@ -130,6 +130,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
81908 int val, valbool;
81909 int retv = -ENOPROTOOPT;
81910
81911+ pax_track_stack();
81912+
81913 if (optval == NULL)
81914 val=0;
81915 else {
81916@@ -881,6 +883,8 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
81917 int len;
81918 int val;
81919
81920+ pax_track_stack();
81921+
81922 if (ip6_mroute_opt(optname))
81923 return ip6_mroute_getsockopt(sk, optname, optval, optlen);
81924
81925@@ -922,7 +926,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
81926 if (sk->sk_type != SOCK_STREAM)
81927 return -ENOPROTOOPT;
81928
81929- msg.msg_control = optval;
81930+ msg.msg_control = (void __force_kernel *)optval;
81931 msg.msg_controllen = len;
81932 msg.msg_flags = 0;
81933
81934diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
81935index 1cf3f0c..1d4376f 100644
81936--- a/net/ipv6/netfilter/ip6_queue.c
81937+++ b/net/ipv6/netfilter/ip6_queue.c
81938@@ -287,6 +287,9 @@ ipq_mangle_ipv6(ipq_verdict_msg_t *v, struct nf_queue_entry *e)
81939
81940 if (v->data_len < sizeof(*user_iph))
81941 return 0;
81942+ if (v->data_len > 65535)
81943+ return -EMSGSIZE;
81944+
81945 diff = v->data_len - e->skb->len;
81946 if (diff < 0) {
81947 if (pskb_trim(e->skb, v->data_len))
81948@@ -411,7 +414,8 @@ ipq_dev_drop(int ifindex)
81949 static inline void
81950 __ipq_rcv_skb(struct sk_buff *skb)
81951 {
81952- int status, type, pid, flags, nlmsglen, skblen;
81953+ int status, type, pid, flags;
81954+ unsigned int nlmsglen, skblen;
81955 struct nlmsghdr *nlh;
81956
81957 skblen = skb->len;
81958diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
81959index 78b5a36..7f37433 100644
81960--- a/net/ipv6/netfilter/ip6_tables.c
81961+++ b/net/ipv6/netfilter/ip6_tables.c
81962@@ -1173,6 +1173,7 @@ static int get_info(struct net *net, void __user *user, int *len, int compat)
81963 private = &tmp;
81964 }
81965 #endif
81966+ memset(&info, 0, sizeof(info));
81967 info.valid_hooks = t->valid_hooks;
81968 memcpy(info.hook_entry, private->hook_entry,
81969 sizeof(info.hook_entry));
81970diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
81971index 4f24570..b813b34 100644
81972--- a/net/ipv6/raw.c
81973+++ b/net/ipv6/raw.c
81974@@ -375,14 +375,14 @@ static inline int rawv6_rcv_skb(struct sock * sk, struct sk_buff * skb)
81975 {
81976 if ((raw6_sk(sk)->checksum || sk->sk_filter) &&
81977 skb_checksum_complete(skb)) {
81978- atomic_inc(&sk->sk_drops);
81979+ atomic_inc_unchecked(&sk->sk_drops);
81980 kfree_skb(skb);
81981 return NET_RX_DROP;
81982 }
81983
81984 /* Charge it to the socket. */
81985 if (sock_queue_rcv_skb(sk,skb)<0) {
81986- atomic_inc(&sk->sk_drops);
81987+ atomic_inc_unchecked(&sk->sk_drops);
81988 kfree_skb(skb);
81989 return NET_RX_DROP;
81990 }
81991@@ -403,7 +403,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
81992 struct raw6_sock *rp = raw6_sk(sk);
81993
81994 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
81995- atomic_inc(&sk->sk_drops);
81996+ atomic_inc_unchecked(&sk->sk_drops);
81997 kfree_skb(skb);
81998 return NET_RX_DROP;
81999 }
82000@@ -427,7 +427,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
82001
82002 if (inet->hdrincl) {
82003 if (skb_checksum_complete(skb)) {
82004- atomic_inc(&sk->sk_drops);
82005+ atomic_inc_unchecked(&sk->sk_drops);
82006 kfree_skb(skb);
82007 return NET_RX_DROP;
82008 }
82009@@ -518,7 +518,7 @@ csum_copy_err:
82010 as some normal condition.
82011 */
82012 err = (flags&MSG_DONTWAIT) ? -EAGAIN : -EHOSTUNREACH;
82013- atomic_inc(&sk->sk_drops);
82014+ atomic_inc_unchecked(&sk->sk_drops);
82015 goto out;
82016 }
82017
82018@@ -600,7 +600,7 @@ out:
82019 return err;
82020 }
82021
82022-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
82023+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
82024 struct flowi *fl, struct rt6_info *rt,
82025 unsigned int flags)
82026 {
82027@@ -738,6 +738,8 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
82028 u16 proto;
82029 int err;
82030
82031+ pax_track_stack();
82032+
82033 /* Rough check on arithmetic overflow,
82034 better check is made in ip6_append_data().
82035 */
82036@@ -916,12 +918,17 @@ do_confirm:
82037 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
82038 char __user *optval, int optlen)
82039 {
82040+ struct icmp6_filter filter;
82041+
82042 switch (optname) {
82043 case ICMPV6_FILTER:
82044+ if (optlen < 0)
82045+ return -EINVAL;
82046 if (optlen > sizeof(struct icmp6_filter))
82047 optlen = sizeof(struct icmp6_filter);
82048- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
82049+ if (copy_from_user(&filter, optval, optlen))
82050 return -EFAULT;
82051+ raw6_sk(sk)->filter = filter;
82052 return 0;
82053 default:
82054 return -ENOPROTOOPT;
82055@@ -934,6 +941,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
82056 char __user *optval, int __user *optlen)
82057 {
82058 int len;
82059+ struct icmp6_filter filter;
82060
82061 switch (optname) {
82062 case ICMPV6_FILTER:
82063@@ -945,7 +953,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
82064 len = sizeof(struct icmp6_filter);
82065 if (put_user(len, optlen))
82066 return -EFAULT;
82067- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
82068+ filter = raw6_sk(sk)->filter;
82069+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
82070 return -EFAULT;
82071 return 0;
82072 default:
82073@@ -1241,7 +1250,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
82074 0, 0L, 0,
82075 sock_i_uid(sp), 0,
82076 sock_i_ino(sp),
82077- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
82078+ atomic_read(&sp->sk_refcnt),
82079+#ifdef CONFIG_GRKERNSEC_HIDESYM
82080+ NULL,
82081+#else
82082+ sp,
82083+#endif
82084+ atomic_read_unchecked(&sp->sk_drops));
82085 }
82086
82087 static int raw6_seq_show(struct seq_file *seq, void *v)
82088diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
82089index faae6df..d4430c1 100644
82090--- a/net/ipv6/tcp_ipv6.c
82091+++ b/net/ipv6/tcp_ipv6.c
82092@@ -89,6 +89,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
82093 }
82094 #endif
82095
82096+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
82097+extern int grsec_enable_blackhole;
82098+#endif
82099+
82100 static void tcp_v6_hash(struct sock *sk)
82101 {
82102 if (sk->sk_state != TCP_CLOSE) {
82103@@ -1579,6 +1583,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
82104 return 0;
82105
82106 reset:
82107+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
82108+ if (!grsec_enable_blackhole)
82109+#endif
82110 tcp_v6_send_reset(sk, skb);
82111 discard:
82112 if (opt_skb)
82113@@ -1656,12 +1663,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
82114 TCP_SKB_CB(skb)->sacked = 0;
82115
82116 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
82117- if (!sk)
82118+ if (!sk) {
82119+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
82120+ ret = 1;
82121+#endif
82122 goto no_tcp_socket;
82123+ }
82124
82125 process:
82126- if (sk->sk_state == TCP_TIME_WAIT)
82127+ if (sk->sk_state == TCP_TIME_WAIT) {
82128+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
82129+ ret = 2;
82130+#endif
82131 goto do_time_wait;
82132+ }
82133
82134 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
82135 goto discard_and_relse;
82136@@ -1701,6 +1716,10 @@ no_tcp_socket:
82137 bad_packet:
82138 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
82139 } else {
82140+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
82141+ if (!grsec_enable_blackhole || (ret == 1 &&
82142+ (skb->dev->flags & IFF_LOOPBACK)))
82143+#endif
82144 tcp_v6_send_reset(NULL, skb);
82145 }
82146
82147@@ -1916,7 +1935,13 @@ static void get_openreq6(struct seq_file *seq,
82148 uid,
82149 0, /* non standard timer */
82150 0, /* open_requests have no inode */
82151- 0, req);
82152+ 0,
82153+#ifdef CONFIG_GRKERNSEC_HIDESYM
82154+ NULL
82155+#else
82156+ req
82157+#endif
82158+ );
82159 }
82160
82161 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
82162@@ -1966,7 +1991,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
82163 sock_i_uid(sp),
82164 icsk->icsk_probes_out,
82165 sock_i_ino(sp),
82166- atomic_read(&sp->sk_refcnt), sp,
82167+ atomic_read(&sp->sk_refcnt),
82168+#ifdef CONFIG_GRKERNSEC_HIDESYM
82169+ NULL,
82170+#else
82171+ sp,
82172+#endif
82173 jiffies_to_clock_t(icsk->icsk_rto),
82174 jiffies_to_clock_t(icsk->icsk_ack.ato),
82175 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
82176@@ -2001,7 +2031,13 @@ static void get_timewait6_sock(struct seq_file *seq,
82177 dest->s6_addr32[2], dest->s6_addr32[3], destp,
82178 tw->tw_substate, 0, 0,
82179 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
82180- atomic_read(&tw->tw_refcnt), tw);
82181+ atomic_read(&tw->tw_refcnt),
82182+#ifdef CONFIG_GRKERNSEC_HIDESYM
82183+ NULL
82184+#else
82185+ tw
82186+#endif
82187+ );
82188 }
82189
82190 static int tcp6_seq_show(struct seq_file *seq, void *v)
82191diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
82192index 9cc6289..052c521 100644
82193--- a/net/ipv6/udp.c
82194+++ b/net/ipv6/udp.c
82195@@ -49,6 +49,10 @@
82196 #include <linux/seq_file.h>
82197 #include "udp_impl.h"
82198
82199+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
82200+extern int grsec_enable_blackhole;
82201+#endif
82202+
82203 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
82204 {
82205 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
82206@@ -391,7 +395,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
82207 if (rc == -ENOMEM) {
82208 UDP6_INC_STATS_BH(sock_net(sk),
82209 UDP_MIB_RCVBUFERRORS, is_udplite);
82210- atomic_inc(&sk->sk_drops);
82211+ atomic_inc_unchecked(&sk->sk_drops);
82212 }
82213 goto drop;
82214 }
82215@@ -590,6 +594,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
82216 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
82217 proto == IPPROTO_UDPLITE);
82218
82219+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
82220+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
82221+#endif
82222 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
82223
82224 kfree_skb(skb);
82225@@ -1209,8 +1216,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
82226 0, 0L, 0,
82227 sock_i_uid(sp), 0,
82228 sock_i_ino(sp),
82229- atomic_read(&sp->sk_refcnt), sp,
82230- atomic_read(&sp->sk_drops));
82231+ atomic_read(&sp->sk_refcnt),
82232+#ifdef CONFIG_GRKERNSEC_HIDESYM
82233+ NULL,
82234+#else
82235+ sp,
82236+#endif
82237+ atomic_read_unchecked(&sp->sk_drops));
82238 }
82239
82240 int udp6_seq_show(struct seq_file *seq, void *v)
82241diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
82242index 811984d..11f59b7 100644
82243--- a/net/irda/ircomm/ircomm_tty.c
82244+++ b/net/irda/ircomm/ircomm_tty.c
82245@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
82246 add_wait_queue(&self->open_wait, &wait);
82247
82248 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
82249- __FILE__,__LINE__, tty->driver->name, self->open_count );
82250+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
82251
82252 /* As far as I can see, we protect open_count - Jean II */
82253 spin_lock_irqsave(&self->spinlock, flags);
82254 if (!tty_hung_up_p(filp)) {
82255 extra_count = 1;
82256- self->open_count--;
82257+ local_dec(&self->open_count);
82258 }
82259 spin_unlock_irqrestore(&self->spinlock, flags);
82260- self->blocked_open++;
82261+ local_inc(&self->blocked_open);
82262
82263 while (1) {
82264 if (tty->termios->c_cflag & CBAUD) {
82265@@ -329,7 +329,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
82266 }
82267
82268 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
82269- __FILE__,__LINE__, tty->driver->name, self->open_count );
82270+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
82271
82272 schedule();
82273 }
82274@@ -340,13 +340,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
82275 if (extra_count) {
82276 /* ++ is not atomic, so this should be protected - Jean II */
82277 spin_lock_irqsave(&self->spinlock, flags);
82278- self->open_count++;
82279+ local_inc(&self->open_count);
82280 spin_unlock_irqrestore(&self->spinlock, flags);
82281 }
82282- self->blocked_open--;
82283+ local_dec(&self->blocked_open);
82284
82285 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
82286- __FILE__,__LINE__, tty->driver->name, self->open_count);
82287+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
82288
82289 if (!retval)
82290 self->flags |= ASYNC_NORMAL_ACTIVE;
82291@@ -415,14 +415,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
82292 }
82293 /* ++ is not atomic, so this should be protected - Jean II */
82294 spin_lock_irqsave(&self->spinlock, flags);
82295- self->open_count++;
82296+ local_inc(&self->open_count);
82297
82298 tty->driver_data = self;
82299 self->tty = tty;
82300 spin_unlock_irqrestore(&self->spinlock, flags);
82301
82302 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
82303- self->line, self->open_count);
82304+ self->line, local_read(&self->open_count));
82305
82306 /* Not really used by us, but lets do it anyway */
82307 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
82308@@ -511,7 +511,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
82309 return;
82310 }
82311
82312- if ((tty->count == 1) && (self->open_count != 1)) {
82313+ if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
82314 /*
82315 * Uh, oh. tty->count is 1, which means that the tty
82316 * structure will be freed. state->count should always
82317@@ -521,16 +521,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
82318 */
82319 IRDA_DEBUG(0, "%s(), bad serial port count; "
82320 "tty->count is 1, state->count is %d\n", __func__ ,
82321- self->open_count);
82322- self->open_count = 1;
82323+ local_read(&self->open_count));
82324+ local_set(&self->open_count, 1);
82325 }
82326
82327- if (--self->open_count < 0) {
82328+ if (local_dec_return(&self->open_count) < 0) {
82329 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
82330- __func__, self->line, self->open_count);
82331- self->open_count = 0;
82332+ __func__, self->line, local_read(&self->open_count));
82333+ local_set(&self->open_count, 0);
82334 }
82335- if (self->open_count) {
82336+ if (local_read(&self->open_count)) {
82337 spin_unlock_irqrestore(&self->spinlock, flags);
82338
82339 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
82340@@ -562,7 +562,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
82341 tty->closing = 0;
82342 self->tty = NULL;
82343
82344- if (self->blocked_open) {
82345+ if (local_read(&self->blocked_open)) {
82346 if (self->close_delay)
82347 schedule_timeout_interruptible(self->close_delay);
82348 wake_up_interruptible(&self->open_wait);
82349@@ -1017,7 +1017,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
82350 spin_lock_irqsave(&self->spinlock, flags);
82351 self->flags &= ~ASYNC_NORMAL_ACTIVE;
82352 self->tty = NULL;
82353- self->open_count = 0;
82354+ local_set(&self->open_count, 0);
82355 spin_unlock_irqrestore(&self->spinlock, flags);
82356
82357 wake_up_interruptible(&self->open_wait);
82358@@ -1369,7 +1369,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
82359 seq_putc(m, '\n');
82360
82361 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
82362- seq_printf(m, "Open count: %d\n", self->open_count);
82363+ seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
82364 seq_printf(m, "Max data size: %d\n", self->max_data_size);
82365 seq_printf(m, "Max header size: %d\n", self->max_header_size);
82366
82367diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
82368index bada1b9..f325943 100644
82369--- a/net/iucv/af_iucv.c
82370+++ b/net/iucv/af_iucv.c
82371@@ -651,10 +651,10 @@ static int iucv_sock_autobind(struct sock *sk)
82372
82373 write_lock_bh(&iucv_sk_list.lock);
82374
82375- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
82376+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
82377 while (__iucv_get_sock_by_name(name)) {
82378 sprintf(name, "%08x",
82379- atomic_inc_return(&iucv_sk_list.autobind_name));
82380+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
82381 }
82382
82383 write_unlock_bh(&iucv_sk_list.lock);
82384diff --git a/net/key/af_key.c b/net/key/af_key.c
82385index 4e98193..439b449 100644
82386--- a/net/key/af_key.c
82387+++ b/net/key/af_key.c
82388@@ -2489,6 +2489,8 @@ static int pfkey_migrate(struct sock *sk, struct sk_buff *skb,
82389 struct xfrm_migrate m[XFRM_MAX_DEPTH];
82390 struct xfrm_kmaddress k;
82391
82392+ pax_track_stack();
82393+
82394 if (!present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC - 1],
82395 ext_hdrs[SADB_EXT_ADDRESS_DST - 1]) ||
82396 !ext_hdrs[SADB_X_EXT_POLICY - 1]) {
82397@@ -3660,7 +3662,11 @@ static int pfkey_seq_show(struct seq_file *f, void *v)
82398 seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
82399 else
82400 seq_printf(f ,"%p %-6d %-6u %-6u %-6u %-6lu\n",
82401+#ifdef CONFIG_GRKERNSEC_HIDESYM
82402+ NULL,
82403+#else
82404 s,
82405+#endif
82406 atomic_read(&s->sk_refcnt),
82407 sk_rmem_alloc_get(s),
82408 sk_wmem_alloc_get(s),
82409diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c
82410index bda96d1..c038b72 100644
82411--- a/net/lapb/lapb_iface.c
82412+++ b/net/lapb/lapb_iface.c
82413@@ -157,7 +157,7 @@ int lapb_register(struct net_device *dev, struct lapb_register_struct *callbacks
82414 goto out;
82415
82416 lapb->dev = dev;
82417- lapb->callbacks = *callbacks;
82418+ lapb->callbacks = callbacks;
82419
82420 __lapb_insert_cb(lapb);
82421
82422@@ -379,32 +379,32 @@ int lapb_data_received(struct net_device *dev, struct sk_buff *skb)
82423
82424 void lapb_connect_confirmation(struct lapb_cb *lapb, int reason)
82425 {
82426- if (lapb->callbacks.connect_confirmation)
82427- lapb->callbacks.connect_confirmation(lapb->dev, reason);
82428+ if (lapb->callbacks->connect_confirmation)
82429+ lapb->callbacks->connect_confirmation(lapb->dev, reason);
82430 }
82431
82432 void lapb_connect_indication(struct lapb_cb *lapb, int reason)
82433 {
82434- if (lapb->callbacks.connect_indication)
82435- lapb->callbacks.connect_indication(lapb->dev, reason);
82436+ if (lapb->callbacks->connect_indication)
82437+ lapb->callbacks->connect_indication(lapb->dev, reason);
82438 }
82439
82440 void lapb_disconnect_confirmation(struct lapb_cb *lapb, int reason)
82441 {
82442- if (lapb->callbacks.disconnect_confirmation)
82443- lapb->callbacks.disconnect_confirmation(lapb->dev, reason);
82444+ if (lapb->callbacks->disconnect_confirmation)
82445+ lapb->callbacks->disconnect_confirmation(lapb->dev, reason);
82446 }
82447
82448 void lapb_disconnect_indication(struct lapb_cb *lapb, int reason)
82449 {
82450- if (lapb->callbacks.disconnect_indication)
82451- lapb->callbacks.disconnect_indication(lapb->dev, reason);
82452+ if (lapb->callbacks->disconnect_indication)
82453+ lapb->callbacks->disconnect_indication(lapb->dev, reason);
82454 }
82455
82456 int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb)
82457 {
82458- if (lapb->callbacks.data_indication)
82459- return lapb->callbacks.data_indication(lapb->dev, skb);
82460+ if (lapb->callbacks->data_indication)
82461+ return lapb->callbacks->data_indication(lapb->dev, skb);
82462
82463 kfree_skb(skb);
82464 return NET_RX_SUCCESS; /* For now; must be != NET_RX_DROP */
82465@@ -414,8 +414,8 @@ int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb)
82466 {
82467 int used = 0;
82468
82469- if (lapb->callbacks.data_transmit) {
82470- lapb->callbacks.data_transmit(lapb->dev, skb);
82471+ if (lapb->callbacks->data_transmit) {
82472+ lapb->callbacks->data_transmit(lapb->dev, skb);
82473 used = 1;
82474 }
82475
82476diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
82477index fe2d3f8..e57f683 100644
82478--- a/net/mac80211/cfg.c
82479+++ b/net/mac80211/cfg.c
82480@@ -1369,7 +1369,7 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,
82481 return err;
82482 }
82483
82484-struct cfg80211_ops mac80211_config_ops = {
82485+const struct cfg80211_ops mac80211_config_ops = {
82486 .add_virtual_intf = ieee80211_add_iface,
82487 .del_virtual_intf = ieee80211_del_iface,
82488 .change_virtual_intf = ieee80211_change_iface,
82489diff --git a/net/mac80211/cfg.h b/net/mac80211/cfg.h
82490index 7d7879f..2d51f62 100644
82491--- a/net/mac80211/cfg.h
82492+++ b/net/mac80211/cfg.h
82493@@ -4,6 +4,6 @@
82494 #ifndef __CFG_H
82495 #define __CFG_H
82496
82497-extern struct cfg80211_ops mac80211_config_ops;
82498+extern const struct cfg80211_ops mac80211_config_ops;
82499
82500 #endif /* __CFG_H */
82501diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c
82502index 99c7525..9cb4937 100644
82503--- a/net/mac80211/debugfs_key.c
82504+++ b/net/mac80211/debugfs_key.c
82505@@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file *file, char __user *userbuf,
82506 size_t count, loff_t *ppos)
82507 {
82508 struct ieee80211_key *key = file->private_data;
82509- int i, res, bufsize = 2 * key->conf.keylen + 2;
82510+ int i, bufsize = 2 * key->conf.keylen + 2;
82511 char *buf = kmalloc(bufsize, GFP_KERNEL);
82512 char *p = buf;
82513+ ssize_t res;
82514+
82515+ if (buf == NULL)
82516+ return -ENOMEM;
82517
82518 for (i = 0; i < key->conf.keylen; i++)
82519 p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]);
82520diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
82521index 33a2e89..08650c8 100644
82522--- a/net/mac80211/debugfs_sta.c
82523+++ b/net/mac80211/debugfs_sta.c
82524@@ -124,6 +124,8 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
82525 int i;
82526 struct sta_info *sta = file->private_data;
82527
82528+ pax_track_stack();
82529+
82530 spin_lock_bh(&sta->lock);
82531 p += scnprintf(p, sizeof(buf)+buf-p, "next dialog_token is %#02x\n",
82532 sta->ampdu_mlme.dialog_token_allocator + 1);
82533diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
82534index ca62bfe..6657a03 100644
82535--- a/net/mac80211/ieee80211_i.h
82536+++ b/net/mac80211/ieee80211_i.h
82537@@ -25,6 +25,7 @@
82538 #include <linux/etherdevice.h>
82539 #include <net/cfg80211.h>
82540 #include <net/mac80211.h>
82541+#include <asm/local.h>
82542 #include "key.h"
82543 #include "sta_info.h"
82544
82545@@ -635,7 +636,7 @@ struct ieee80211_local {
82546 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
82547 spinlock_t queue_stop_reason_lock;
82548
82549- int open_count;
82550+ local_t open_count;
82551 int monitors, cooked_mntrs;
82552 /* number of interfaces with corresponding FIF_ flags */
82553 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
82554diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
82555index 079c500..eb3c6d4 100644
82556--- a/net/mac80211/iface.c
82557+++ b/net/mac80211/iface.c
82558@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_device *dev)
82559 break;
82560 }
82561
82562- if (local->open_count == 0) {
82563+ if (local_read(&local->open_count) == 0) {
82564 res = drv_start(local);
82565 if (res)
82566 goto err_del_bss;
82567@@ -196,7 +196,7 @@ static int ieee80211_open(struct net_device *dev)
82568 * Validate the MAC address for this device.
82569 */
82570 if (!is_valid_ether_addr(dev->dev_addr)) {
82571- if (!local->open_count)
82572+ if (!local_read(&local->open_count))
82573 drv_stop(local);
82574 return -EADDRNOTAVAIL;
82575 }
82576@@ -292,7 +292,7 @@ static int ieee80211_open(struct net_device *dev)
82577
82578 hw_reconf_flags |= __ieee80211_recalc_idle(local);
82579
82580- local->open_count++;
82581+ local_inc(&local->open_count);
82582 if (hw_reconf_flags) {
82583 ieee80211_hw_config(local, hw_reconf_flags);
82584 /*
82585@@ -320,7 +320,7 @@ static int ieee80211_open(struct net_device *dev)
82586 err_del_interface:
82587 drv_remove_interface(local, &conf);
82588 err_stop:
82589- if (!local->open_count)
82590+ if (!local_read(&local->open_count))
82591 drv_stop(local);
82592 err_del_bss:
82593 sdata->bss = NULL;
82594@@ -420,7 +420,7 @@ static int ieee80211_stop(struct net_device *dev)
82595 WARN_ON(!list_empty(&sdata->u.ap.vlans));
82596 }
82597
82598- local->open_count--;
82599+ local_dec(&local->open_count);
82600
82601 switch (sdata->vif.type) {
82602 case NL80211_IFTYPE_AP_VLAN:
82603@@ -526,7 +526,7 @@ static int ieee80211_stop(struct net_device *dev)
82604
82605 ieee80211_recalc_ps(local, -1);
82606
82607- if (local->open_count == 0) {
82608+ if (local_read(&local->open_count) == 0) {
82609 ieee80211_clear_tx_pending(local);
82610 ieee80211_stop_device(local);
82611
82612diff --git a/net/mac80211/main.c b/net/mac80211/main.c
82613index 2dfe176..74e4388 100644
82614--- a/net/mac80211/main.c
82615+++ b/net/mac80211/main.c
82616@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
82617 local->hw.conf.power_level = power;
82618 }
82619
82620- if (changed && local->open_count) {
82621+ if (changed && local_read(&local->open_count)) {
82622 ret = drv_config(local, changed);
82623 /*
82624 * Goal:
82625diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
82626index e67eea7..fcc227e 100644
82627--- a/net/mac80211/mlme.c
82628+++ b/net/mac80211/mlme.c
82629@@ -1438,6 +1438,8 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
82630 bool have_higher_than_11mbit = false, newsta = false;
82631 u16 ap_ht_cap_flags;
82632
82633+ pax_track_stack();
82634+
82635 /*
82636 * AssocResp and ReassocResp have identical structure, so process both
82637 * of them in this function.
82638diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
82639index e535f1c..4d733d1 100644
82640--- a/net/mac80211/pm.c
82641+++ b/net/mac80211/pm.c
82642@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
82643 }
82644
82645 /* stop hardware - this must stop RX */
82646- if (local->open_count)
82647+ if (local_read(&local->open_count))
82648 ieee80211_stop_device(local);
82649
82650 local->suspended = true;
82651diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
82652index b33efc4..0a2efb6 100644
82653--- a/net/mac80211/rate.c
82654+++ b/net/mac80211/rate.c
82655@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
82656 struct rate_control_ref *ref, *old;
82657
82658 ASSERT_RTNL();
82659- if (local->open_count)
82660+ if (local_read(&local->open_count))
82661 return -EBUSY;
82662
82663 ref = rate_control_alloc(name, local);
82664diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
82665index b1d7904..57e4da7 100644
82666--- a/net/mac80211/tx.c
82667+++ b/net/mac80211/tx.c
82668@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr,
82669 return cpu_to_le16(dur);
82670 }
82671
82672-static int inline is_ieee80211_device(struct ieee80211_local *local,
82673+static inline int is_ieee80211_device(struct ieee80211_local *local,
82674 struct net_device *dev)
82675 {
82676 return local == wdev_priv(dev->ieee80211_ptr);
82677diff --git a/net/mac80211/util.c b/net/mac80211/util.c
82678index 31b1085..48fb26d 100644
82679--- a/net/mac80211/util.c
82680+++ b/net/mac80211/util.c
82681@@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
82682 local->resuming = true;
82683
82684 /* restart hardware */
82685- if (local->open_count) {
82686+ if (local_read(&local->open_count)) {
82687 /*
82688 * Upon resume hardware can sometimes be goofy due to
82689 * various platform / driver / bus issues, so restarting
82690diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
82691index 634d14a..b35a608 100644
82692--- a/net/netfilter/Kconfig
82693+++ b/net/netfilter/Kconfig
82694@@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP
82695
82696 To compile it as a module, choose M here. If unsure, say N.
82697
82698+config NETFILTER_XT_MATCH_GRADM
82699+ tristate '"gradm" match support'
82700+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
82701+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
82702+ ---help---
82703+ The gradm match allows to match on grsecurity RBAC being enabled.
82704+ It is useful when iptables rules are applied early on bootup to
82705+ prevent connections to the machine (except from a trusted host)
82706+ while the RBAC system is disabled.
82707+
82708 config NETFILTER_XT_MATCH_HASHLIMIT
82709 tristate '"hashlimit" match support'
82710 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
82711diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
82712index 49f62ee..a17b2c6 100644
82713--- a/net/netfilter/Makefile
82714+++ b/net/netfilter/Makefile
82715@@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRACK) += xt_conntrack.o
82716 obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
82717 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
82718 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
82719+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
82720 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
82721 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
82722 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
82723diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
82724index 3c7e427..724043c 100644
82725--- a/net/netfilter/ipvs/ip_vs_app.c
82726+++ b/net/netfilter/ipvs/ip_vs_app.c
82727@@ -564,7 +564,7 @@ static const struct file_operations ip_vs_app_fops = {
82728 .open = ip_vs_app_open,
82729 .read = seq_read,
82730 .llseek = seq_lseek,
82731- .release = seq_release,
82732+ .release = seq_release_net,
82733 };
82734 #endif
82735
82736diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
82737index 95682e5..457dbac 100644
82738--- a/net/netfilter/ipvs/ip_vs_conn.c
82739+++ b/net/netfilter/ipvs/ip_vs_conn.c
82740@@ -453,10 +453,10 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
82741 /* if the connection is not template and is created
82742 * by sync, preserve the activity flag.
82743 */
82744- cp->flags |= atomic_read(&dest->conn_flags) &
82745+ cp->flags |= atomic_read_unchecked(&dest->conn_flags) &
82746 (~IP_VS_CONN_F_INACTIVE);
82747 else
82748- cp->flags |= atomic_read(&dest->conn_flags);
82749+ cp->flags |= atomic_read_unchecked(&dest->conn_flags);
82750 cp->dest = dest;
82751
82752 IP_VS_DBG_BUF(7, "Bind-dest %s c:%s:%d v:%s:%d "
82753@@ -723,7 +723,7 @@ ip_vs_conn_new(int af, int proto, const union nf_inet_addr *caddr, __be16 cport,
82754 atomic_set(&cp->refcnt, 1);
82755
82756 atomic_set(&cp->n_control, 0);
82757- atomic_set(&cp->in_pkts, 0);
82758+ atomic_set_unchecked(&cp->in_pkts, 0);
82759
82760 atomic_inc(&ip_vs_conn_count);
82761 if (flags & IP_VS_CONN_F_NO_CPORT)
82762@@ -871,7 +871,7 @@ static const struct file_operations ip_vs_conn_fops = {
82763 .open = ip_vs_conn_open,
82764 .read = seq_read,
82765 .llseek = seq_lseek,
82766- .release = seq_release,
82767+ .release = seq_release_net,
82768 };
82769
82770 static const char *ip_vs_origin_name(unsigned flags)
82771@@ -934,7 +934,7 @@ static const struct file_operations ip_vs_conn_sync_fops = {
82772 .open = ip_vs_conn_sync_open,
82773 .read = seq_read,
82774 .llseek = seq_lseek,
82775- .release = seq_release,
82776+ .release = seq_release_net,
82777 };
82778
82779 #endif
82780@@ -961,7 +961,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
82781
82782 /* Don't drop the entry if its number of incoming packets is not
82783 located in [0, 8] */
82784- i = atomic_read(&cp->in_pkts);
82785+ i = atomic_read_unchecked(&cp->in_pkts);
82786 if (i > 8 || i < 0) return 0;
82787
82788 if (!todrop_rate[i]) return 0;
82789diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
82790index b95699f..5fee919 100644
82791--- a/net/netfilter/ipvs/ip_vs_core.c
82792+++ b/net/netfilter/ipvs/ip_vs_core.c
82793@@ -485,7 +485,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
82794 ret = cp->packet_xmit(skb, cp, pp);
82795 /* do not touch skb anymore */
82796
82797- atomic_inc(&cp->in_pkts);
82798+ atomic_inc_unchecked(&cp->in_pkts);
82799 ip_vs_conn_put(cp);
82800 return ret;
82801 }
82802@@ -1357,7 +1357,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb,
82803 * Sync connection if it is about to close to
82804 * encorage the standby servers to update the connections timeout
82805 */
82806- pkts = atomic_add_return(1, &cp->in_pkts);
82807+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
82808 if (af == AF_INET &&
82809 (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
82810 (((cp->protocol != IPPROTO_TCP ||
82811diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
82812index 02b2610..2d89424 100644
82813--- a/net/netfilter/ipvs/ip_vs_ctl.c
82814+++ b/net/netfilter/ipvs/ip_vs_ctl.c
82815@@ -792,7 +792,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc,
82816 ip_vs_rs_hash(dest);
82817 write_unlock_bh(&__ip_vs_rs_lock);
82818 }
82819- atomic_set(&dest->conn_flags, conn_flags);
82820+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
82821
82822 /* bind the service */
82823 if (!dest->svc) {
82824@@ -1888,7 +1888,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
82825 " %-7s %-6d %-10d %-10d\n",
82826 &dest->addr.in6,
82827 ntohs(dest->port),
82828- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
82829+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
82830 atomic_read(&dest->weight),
82831 atomic_read(&dest->activeconns),
82832 atomic_read(&dest->inactconns));
82833@@ -1899,7 +1899,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
82834 "%-7s %-6d %-10d %-10d\n",
82835 ntohl(dest->addr.ip),
82836 ntohs(dest->port),
82837- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
82838+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
82839 atomic_read(&dest->weight),
82840 atomic_read(&dest->activeconns),
82841 atomic_read(&dest->inactconns));
82842@@ -1927,7 +1927,7 @@ static const struct file_operations ip_vs_info_fops = {
82843 .open = ip_vs_info_open,
82844 .read = seq_read,
82845 .llseek = seq_lseek,
82846- .release = seq_release_private,
82847+ .release = seq_release_net,
82848 };
82849
82850 #endif
82851@@ -1976,7 +1976,7 @@ static const struct file_operations ip_vs_stats_fops = {
82852 .open = ip_vs_stats_seq_open,
82853 .read = seq_read,
82854 .llseek = seq_lseek,
82855- .release = single_release,
82856+ .release = single_release_net,
82857 };
82858
82859 #endif
82860@@ -2292,7 +2292,7 @@ __ip_vs_get_dest_entries(const struct ip_vs_get_dests *get,
82861
82862 entry.addr = dest->addr.ip;
82863 entry.port = dest->port;
82864- entry.conn_flags = atomic_read(&dest->conn_flags);
82865+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
82866 entry.weight = atomic_read(&dest->weight);
82867 entry.u_threshold = dest->u_threshold;
82868 entry.l_threshold = dest->l_threshold;
82869@@ -2353,6 +2353,8 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
82870 unsigned char arg[128];
82871 int ret = 0;
82872
82873+ pax_track_stack();
82874+
82875 if (!capable(CAP_NET_ADMIN))
82876 return -EPERM;
82877
82878@@ -2802,7 +2804,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
82879 NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
82880
82881 NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
82882- atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
82883+ atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
82884 NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
82885 NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
82886 NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
82887diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
82888index e177f0d..55e8581 100644
82889--- a/net/netfilter/ipvs/ip_vs_sync.c
82890+++ b/net/netfilter/ipvs/ip_vs_sync.c
82891@@ -438,7 +438,7 @@ static void ip_vs_process_message(const char *buffer, const size_t buflen)
82892
82893 if (opt)
82894 memcpy(&cp->in_seq, opt, sizeof(*opt));
82895- atomic_set(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
82896+ atomic_set_unchecked(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
82897 cp->state = state;
82898 cp->old_state = cp->state;
82899 /*
82900diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
82901index 30b3189..e2e4b55 100644
82902--- a/net/netfilter/ipvs/ip_vs_xmit.c
82903+++ b/net/netfilter/ipvs/ip_vs_xmit.c
82904@@ -875,7 +875,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
82905 else
82906 rc = NF_ACCEPT;
82907 /* do not touch skb anymore */
82908- atomic_inc(&cp->in_pkts);
82909+ atomic_inc_unchecked(&cp->in_pkts);
82910 goto out;
82911 }
82912
82913@@ -949,7 +949,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
82914 else
82915 rc = NF_ACCEPT;
82916 /* do not touch skb anymore */
82917- atomic_inc(&cp->in_pkts);
82918+ atomic_inc_unchecked(&cp->in_pkts);
82919 goto out;
82920 }
82921
82922diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
82923index d521718..d0fd7a1 100644
82924--- a/net/netfilter/nf_conntrack_netlink.c
82925+++ b/net/netfilter/nf_conntrack_netlink.c
82926@@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlattr *attr,
82927 static int
82928 ctnetlink_parse_tuple(const struct nlattr * const cda[],
82929 struct nf_conntrack_tuple *tuple,
82930- enum ctattr_tuple type, u_int8_t l3num)
82931+ enum ctattr_type type, u_int8_t l3num)
82932 {
82933 struct nlattr *tb[CTA_TUPLE_MAX+1];
82934 int err;
82935diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
82936index f900dc3..5e45346 100644
82937--- a/net/netfilter/nfnetlink_log.c
82938+++ b/net/netfilter/nfnetlink_log.c
82939@@ -68,7 +68,7 @@ struct nfulnl_instance {
82940 };
82941
82942 static DEFINE_RWLOCK(instances_lock);
82943-static atomic_t global_seq;
82944+static atomic_unchecked_t global_seq;
82945
82946 #define INSTANCE_BUCKETS 16
82947 static struct hlist_head instance_table[INSTANCE_BUCKETS];
82948@@ -493,7 +493,7 @@ __build_packet_message(struct nfulnl_instance *inst,
82949 /* global sequence number */
82950 if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
82951 NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
82952- htonl(atomic_inc_return(&global_seq)));
82953+ htonl(atomic_inc_return_unchecked(&global_seq)));
82954
82955 if (data_len) {
82956 struct nlattr *nla;
82957diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
82958new file mode 100644
82959index 0000000..b1bac76
82960--- /dev/null
82961+++ b/net/netfilter/xt_gradm.c
82962@@ -0,0 +1,51 @@
82963+/*
82964+ * gradm match for netfilter
82965